gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-misc
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
205 files changed, 1742 insertions, 1097 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 497b471a776b..b4a090b2789a 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 1bef2dd4114a..f424a9d18d51 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -2,7 +2,7 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428
 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
-EBUILD anki-2.1.0_beta25.ebuild 1881 BLAKE2B ff530eefc984bd972004a51c5b958102e31ace78ce8042b567311e8a79ed65b44ed901c675f58b7a386400a1bb3beee6dffe9ecc598ced33d10afd6fb7ce565c SHA512 8faab45dd5c2def4a01083669569f4389f975ed43359b072b24f62e80f32009de34b6b6c5939998f829d4f90d47eb6be310e589f2410b038f7cf7d40bbdf121a
-EBUILD anki-2.1.0_beta27.ebuild 2045 BLAKE2B 7ca21c289792f8792af6116da803934e7a041fa55620b94ad6a0d9b35802514c8c91726613a5a377eaaa3b0ae8d276ce6ea7dd23fbff247e55372cd346c3d6aa SHA512 97a1438144b5597fb3723e8449f2d34596bb6943da4b56676f68354a59d637cd65ff0a85f2603d078ca1fee21e430b462d0443523c948fd2f6d88354c5434060
-EBUILD anki-2.1.13.ebuild 2153 BLAKE2B 6e47d51113307e2a05b34af83a993dfe6f1205dc3914ae2e60fd432ee5868d70ff34dfa1a3ca707cfb7cfc138fc1740ee96baed04271d0be5cff673ab27025f0 SHA512 d2221f7ca96a029346d11e6839eb273526e6e35e9e2b44b5beae46f5ba3de738cb17cd9f959fc853679580ebbb1dc27e09d9c9d2b9d0fd691739ee7a1f816016
+EBUILD anki-2.1.0_beta25.ebuild 1905 BLAKE2B 829fae8c282bf4e1cd4fbce8f316b08f038da25f88563b07844c689d195483bc8639d7ed52901e7fae9414dad6d8ec97a1c07c235b22bc074a2bd6f987394265 SHA512 e32db8ebf71b6179a243a47c914be8ee0c2c5fbd3b7fc1f11edd0e59ab89b232160239bf51e5680028568e45337e786e73013ace994c82344dbe5ed6d599e7eb
+EBUILD anki-2.1.0_beta27.ebuild 2072 BLAKE2B e75ad518d27e1214490522445fa0e77aa446816a84c393fecfa3900b98b33ae46043daaa2bbc3f5d94df504307bd49dded57a97bbda1b7eb054d9eb67dffa015 SHA512 7601927a486cd07af40881c9f4763dde1b6752ee161705bf1adf3fab9ccb01423e69b975cae6e7f97f08fbb9ff00a3e22418c02f30d48ea9661b46778867a1b9
+EBUILD anki-2.1.13.ebuild 2180 BLAKE2B 66911e134bf317bf589c3a470d380a2dc1d9df543942a8e1c618658de59b22c10747deee8fa335cdf77d8f81d04d7431b364c80a5272373771762daa1c19c7db SHA512 dc2c6c7374c56c9961c44de9842e3a468e08f540cb06591de5cb77090bff6ad68a93bd7bda3c74e502518dae470b87b66d3641e7d31ee6310cb275ceec7c3968
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
index 71268203040c..7a709e1e39e3 100644
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta25.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
@@ -19,6 +19,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="latex +recording +sound test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
index 9c8bfdb780b3..341c641fe86e 100644
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -19,6 +19,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="latex +recording +sound test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13.ebuild
index a9775f88b929..15c2f2cdf075 100644
--- a/app-misc/anki/anki-2.1.13.ebuild
+++ b/app-misc/anki/anki-2.1.13.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="latex +recording +sound test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 3b593ee7674f..809119548bad 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,3 @@
 DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.2.ebuild 709 BLAKE2B 9abd93db0b1533e7acbb29823f1d581f98c24585d3ea79bb88cf85ba2a7793b9b108ce6ee1b4e53f0c46b354cf50503bf3fbe606156f80d4cbeeb3a8f6c5fe2a SHA512 4dfe4fe80dd355e46ac2ff854a61dc29ed3b28518bf809b0e2ce26575cf338bf5866f20721a60f74ce1ea433de1964c07e83027e5c447ae11e16cb4cc56d52d4
+EBUILD asciinema-2.0.2.ebuild 736 BLAKE2B e62cefedba2de6d65158d83716b3ab3e82d1fe465f90c75e2708e82ba8e0b7f46352bea5b197f394dea12a1cbb656ae4a2cf5e0fb78b88e273b0406b3c1415a7 SHA512 a2b407972bff15ed3a04fa237e6415afdffd2e694fbe2a9290d930a6c4ae6647a4aa22e5b07384d4f36390b527135d1d769df1a9d3363b669bc21c87e4191a80
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2.ebuild
index 7c74de515eac..ff9eafcc5799 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 8add1859be5c..3e44f9c79c88 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,3 +1,3 @@
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
-EBUILD bgrep-0_p20110121-r1.ebuild 808 BLAKE2B 98a07f22d204e446637044b18602131109ecea3461aba61a32c0353fda032efb879567018b3941e6022b6e095f95c0ab14b9c0ea1bcbea1cca3c58507c1e6ee1 SHA512 e8730552f2254833d720425a0c6030348ff5326d0456dfe3a7c920bae0b903b1869f1aea87c698e762dbe9c2ba985473fbe4689f3f93c5df083e93a848d39041
+EBUILD bgrep-0_p20110121-r1.ebuild 835 BLAKE2B be476291900a3b914cfb7615c4f49819aacae13adc798568b0683018ad80928c204264cd55e0cdc3ac2cc32cc5b0b080d46e29f59763531586b77f272d8b72ce SHA512 0eb81251c1f16f93fb9cddc2a5249fe897cca706fd30021140251e260d48fe23c72a87de4af71c0d57eb28350706139ae0c7522e8ae19c63b8a7e41e2ad0a3b8
 MISC metadata.xml 247 BLAKE2B 4dd4124b036016fe5a8788cc1d59340e0490958026874cb3dc532f8dcd493845417b21140d2c258ed0158b6d7f5391c6d714b77bc9a0ab199fbb6d1111411186 SHA512 1e996ebfddd8be6fac44c0a28fc7b4c961e4f9916433adf3e790f3cf8e900e6e1d72a11f4540213580fc5eec50528e45d7da6d4ad1f9e8eb764be2263154ea28
diff --git a/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild b/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
index bdcaf0ef288e..6f15514382ce 100644
--- a/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
+++ b/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
@@ -20,6 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="test? ( dev-lang/perl )"
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index f70bd0b8a776..0c9fda53d305 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,5 @@
 DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e
 DIST bijiben-3.32.2.tar.xz 659988 BLAKE2B a155b3ad4d340b6efe039ae8458be6665f5ea37935b2040d8aa59f4b019a7ce2a9bb42c309fbc212b8f87cd2e3db533305b64d6987b3b527435ab9906165a7ff SHA512 71573ced01a5e984998fc5ce97ebbd4fcf04a91165465697ff29ea67076a31654b8f66a93c3ed79b30a8af2e38fad3ac4bfc3047106411078c6cbb67c20d5c5d
 EBUILD bijiben-3.26.2.ebuild 704 BLAKE2B e65c95e57d73b6186faa1f357b2e1142d81b4a83b17e25d18dca179d2878f2bc5082addc7961c18934ce8e295e8d785ff4851cc113b3572d2844bcf64b224224 SHA512 2f53ede5cbfc0bc5b79ed43fbb8a7bb42194f2c5d8dc2a932b701879b2641bbfd807428cd15ca888a82095b36a28a0824955ccc8c1882cf4ed68059e4fa77959
-EBUILD bijiben-3.32.2.ebuild 1025 BLAKE2B b12ed34f6711aa3358412fff42de809022c528887039fd5e0eacf9a5c845a30addd8fe7f7f028abd81c4b545b88f488ad638ee3fae117e404323a179d03041f2 SHA512 52d06fa541b07608041f463999dd12d8268e0fd8ef089244af9fdda8c2a852ab05e15e5f2d8095106c50fd54d5e774d3462a2fe3512ef10bb51e56f1a5e32192
+EBUILD bijiben-3.32.2.ebuild 1023 BLAKE2B bbf22b018156463324ae5fc95643aa29a989f972ce8eec284a1572bc04c14ac38cb899c3f769742f57a10be0d46ef639c44aa5cd406c5370611d856559499707 SHA512 cbc7343453e07bb6f9d775f2f4e59f9758a9c94270ea9fbbf486e93b876b3f6cbae3b8f973f0ef27be5a17cdfe9eaddcee0197a9d3a4ff83e9525fd3623ab6e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.32.2.ebuild b/app-misc/bijiben/bijiben-3.32.2.ebuild
index 9d14aaf463c2..1baa2177e9b6 100644
--- a/app-misc/bijiben/bijiben-3.32.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.32.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 23f967849765..0cfc188e6ae7 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,8 @@
 AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
+AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
+DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
 EBUILD binwalk-2.1.1.ebuild 1109 BLAKE2B d3cbcd0b70ed93e89beb8903cf4e1823f4a24d3fba9b6f97dda7edd14ba115e8dd0c06c3737964773b101948d7cde3341194f0a0493b873fbcd690c44bdb60ae SHA512 482c783b196f424dac46c9da8ddacbafe5bcc6823a4845d74b66a59fee6ca376a3f010e7caf71e58a097e904c86e0a366da2fe178c012fa12d52be72a5c1f519
-EBUILD binwalk-9999.ebuild 1020 BLAKE2B 490c90cce06ed6cfb9fef23852c22b0811687ee67c541a09b7ad5afa90bdac26d1525b5e14459306cd10ff8ce94ab1485915c84ce8177740f503338c349bd2b3 SHA512 3d5180c94d95971b15f9ecc5e5805b4d0f78891f4768ec05fdba32cacac7bd332ebfe8ad2b8a1634312d2c9aa70ef25219b6c8892dde618931ad9b511306dc24
-MISC metadata.xml 1043 BLAKE2B 3c31b5153464d9c439fdcab70b47aeccce5d0a8ec4acb57bf519830b80915bfe3e38dc0d995fc875f5b217bb354bc250043684188a2fc7988948039761204c2e SHA512 4f8c75bff33aee8f04748e52a6c13a866c08b1e0a9e4ff47fa5ccbf2a4e203e1324c6571edc57ce7713a1fc18af3f6d68645a725df84530aab03cf6f87dda5bc
+EBUILD binwalk-2.2.0.ebuild 1149 BLAKE2B 8d3b192341c37ab923e3cc5068e3ac98ffdde2dbed5c406eba2c1d05e20b239a4ef9f866b30b64fae37415ba279e7ed8c511367f3e76f8f1851c201a9c9c0103 SHA512 3b8088e56752a6f9481026a3fa376ef301ba91e9c8a4d4bb99e930401d45ccd84c58f467c7d148f191d0064a3d22cec2cf21bc86303f59143492248ce1893505
+EBUILD binwalk-9999.ebuild 1149 BLAKE2B 8d3b192341c37ab923e3cc5068e3ac98ffdde2dbed5c406eba2c1d05e20b239a4ef9f866b30b64fae37415ba279e7ed8c511367f3e76f8f1851c201a9c9c0103 SHA512 3b8088e56752a6f9481026a3fa376ef301ba91e9c8a4d4bb99e930401d45ccd84c58f467c7d148f191d0064a3d22cec2cf21bc86303f59143492248ce1893505
+MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
new file mode 100644
index 000000000000..cd3986d63469
--- /dev/null
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# 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,3_8} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( API.md INSTALL.md README.md )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "binwalk has many optional dependencies to automatically"
+		elog "extract/decompress data, see INSTALL.md for more details."
+	fi
+}
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 650ee2faadf9..cd3986d63469 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -19,12 +19,17 @@ HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="graph"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)
-	graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
+RDEPEND="$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+
+python_test() {
+	esetup.py test
+}
 
 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )
diff --git a/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch b/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch
new file mode 100644
index 000000000000..5dd322ba6036
--- /dev/null
+++ b/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch
@@ -0,0 +1,14 @@
+Avoid having to pull in dev-python/coverage test dep since we don't care about
+coverage.
+
+--- binwalk-2.2.0/setup.py
++++ binwalk-2.2.0/setup.py
+@@ -303,7 +303,7 @@
+         os.chdir(testing_directory)
+ 
+         # Run the tests
+-        retval = nose.core.run(argv=['--exe','--with-coverage'])
++        retval = nose.core.run(argv=['--exe'])
+ 
+         sys.stdout.write("\n")
+ 
diff --git a/app-misc/binwalk/metadata.xml b/app-misc/binwalk/metadata.xml
index 9cd3f7b9f5c1..12e5ca8a3e8a 100644
--- a/app-misc/binwalk/metadata.xml
+++ b/app-misc/binwalk/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
 		Binwalk is a tool for searching a given binary image for embedded files.
@@ -16,8 +16,7 @@
 		filesystems, etc.
 	</longdescription>
 	<upstream>
-		<remote-id type="google-code">binwalk</remote-id>
-		<remote-id type="github">devttys0/binwalk</remote-id>
+		<remote-id type="github">ReFirmLabs/binwalk</remote-id>
 	</upstream>
 	<use>
 		<flag name="graph">Enable support for generating entropy graphs</flag>
diff --git a/app-misc/blink1/Manifest b/app-misc/blink1/Manifest
index 61c4b9e37163..0e0610d8f471 100644
--- a/app-misc/blink1/Manifest
+++ b/app-misc/blink1/Manifest
@@ -1,3 +1,3 @@
 DIST blink1-1.98.tar.gz 29439933 BLAKE2B 5c775819c9401c04e1c9adeb3dcb1f524ed30b6493380368b063a6ef94af75ab30e8b7f43e1b195f17578a1625bc6118bd65c7402376560ab5ee00e80f0c5c04 SHA512 2057e3ccf149dbdaaea2d09dabaa95317125d65151dc79c675365f55e85a3d0988232fd5ff404bdcfd127ebc266495afa04fb1b3fd0e4ac931bb711b0bb63568
-EBUILD blink1-1.98.ebuild 2580 BLAKE2B a68e99cb39c1d183b2802dfce524e807db614d43c6ae22cb1b177b77657b016a5c0fa6c273ec4c6eafa4147c80278feba265dd85aa564f506fd7d915d1e2fd0c SHA512 5675d112620eed4d8647203c52671e0b24a87678c070858828375e84086a3f7959958ce144b921d94e79d28518885e71d159922592de980eb712ee75ade7d950
+EBUILD blink1-1.98.ebuild 2466 BLAKE2B 884a29aee69457cc77ffa318bc2ff20d1353003e387fd58ea409054b9c74d2ae31a4d74796ffad3df9561344df4b8763e712836afe11961a1a32e85c1fb062e0 SHA512 b6746da3e2a6bacc52369198ea5e45531276e1924abaa4e97708c64b23b7ec25da77ba1f1afb0ddbd92575fba8081c76ba068ae10d5cc908d49116cfd211b519
 MISC metadata.xml 579 BLAKE2B 1644cacb6985bbe68c7cdcdaaa5f602fdd79c63c8e3b54ad34b6d97e9c50415ff9d343ab60b9c91bade52b2f59b34e4b0488a091001cb36ba294e0a29ff1b90f SHA512 a848eee9c39a574515aa6a5b70f347960a4c117583e58e2a31b3c714fb91347061518f96b2c8f13cb9167afd9e5478a4c76717af10a5ad5fc084a82fc47a9f7e
diff --git a/app-misc/blink1/blink1-1.98.ebuild b/app-misc/blink1/blink1-1.98.ebuild
index db7709ef64d0..5c644a5a7e37 100644
--- a/app-misc/blink1/blink1-1.98.ebuild
+++ b/app-misc/blink1/blink1-1.98.ebuild
@@ -57,17 +57,17 @@ src_compile() {
 		# USBLIB_TYPE=HIDAPI
 		# USBLIB_TYPE=HIDAPI_HIDRAW
 		# USBLIB_TYPE=HIDDATA
-		emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool || die "emake blink1-tool failed"
+		emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool
 		popd &>/dev/null
 	fi
 	if use mini-tool; then
 		pushd commandline/blink1-mini-tool &>/dev/null
-		emake OS=linux blink1-mini-tool || die "emake blink1-mini-tool failed"
+		emake OS=linux blink1-mini-tool
 		popd &>/dev/null
 	fi
 	if use server; then
 		pushd commandline &>/dev/null
-		emake OS=linux blink1-tiny-server || die "emake blink1-tiny-server failed"
+		emake OS=linux blink1-tiny-server
 		popd &>/dev/null
 	fi
 }
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 19245e894301..25f39dcc0fdb 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -5,5 +5,5 @@ DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b933
 EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
 EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
 EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
-EBUILD byobu-5.129.ebuild 957 BLAKE2B 07981598d2b0694ab5347e790554728f7e9eed24bd34c3ec6c87842d0456aba8613aecfd45d1dba29bb1f45882844c19b955699d3b666840fa9ca77131c0cc28 SHA512 abd87bd8a729334318fa9d79682c681a6add8f3cee5f10b2b13b040260f8ea023097de432a43bc7dc6c261c59aa2fbd8d51854b6ad698015c6af4005a87fa1bd
+EBUILD byobu-5.129.ebuild 953 BLAKE2B 3893b4509dc2bff9352a6b7020f8c8561b13d4943a6ab8a95547f039273cf3ce6cec1084a7a2eedae7ccd52840c926b528eea2cf46d6aa5c67953f91574d33fa SHA512 d68d1733611739bb6d76524619d7dbbc9d8935d1f53bcdd3e88a3d10b4755621bf78df6640659db9e6729edd7773c7809dce5fe451fd326c72ed68c547cfce9e
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
index 2284610ea606..ccb44bcb8188 100644
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ b/app-misc/byobu/byobu-5.129.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit python-single-r1
 
diff --git a/app-misc/cargo-license/Manifest b/app-misc/cargo-license/Manifest
index 396180849649..147a7875796a 100644
--- a/app-misc/cargo-license/Manifest
+++ b/app-misc/cargo-license/Manifest
@@ -1,22 +1,27 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
 DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST cargo-license-0.2.0.crate 4200 BLAKE2B ba4916285dc22a411e437c7273d1ea88db61f1a8fcb01928151f105788ef8b935d91907ac05eca44fe3891d5ff5b3c2be72bc168a109f01995f3bdd211a69a13 SHA512 4cedd66b5fe74ef3be37921b846fc27c0f8b078d70ec2b28a0569b0a08973c9533c167c684d18ae010204a58a9c327dae7d3a92ab148059a2804439515ec1379
-DIST cargo_metadata-0.6.4.crate 7008 BLAKE2B cc5509adceb6f511d740240f3e67417328379cc71028517285c9eabd122ee6032f6d8263501f2a61eebb386dce926968ed3e11f7a468e9b67cc8ef2a2f75395d SHA512 9d7a790e2049bfe1fbfb1574f21e3b701e0220bdf5b86185ecc7e818198e21b00fe75636987cba02e6e39d7025fd50534e8de779273c0d06bfd1a241f7c64cfe
-DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
+DIST cargo-license-0.3.0.crate 8049 BLAKE2B f417270d9b7f318457e0495d8261fd59414b4ea116b64f8b9267b62bf841732c1a5ee874519ae9d5ef756a75279b0880e915bc84ce48cc3807937221b91a3cf0 SHA512 73212ac4e0cc10eff8080a7294bfc3145eb96e7d2255340238a6b413ad0fbabad46ac7a3120835ee2f86818d8da6ca0744ceb7d6d1716ea59d9f315844342083
+DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
+DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
 DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
-DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
 DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
 DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
@@ -24,14 +29,22 @@ DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea4
 DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
 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.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
-DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
-DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
-DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
+DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
+DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
+DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
+DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
-EBUILD cargo-license-0.2.0.ebuild 1082 BLAKE2B 5cbbf14177a20df359af525e438cb4e5c6bbbd0f49056fa23d87fcb6563a39e52e5486e004fcc77d1b013f16681e83546bfc8171efafd0966416f5f53c5c51fc SHA512 652d112111172ea1edf4bc63683ab89f9ab6036d4f5230abfff52045f31f5213f35ee36aea8f5c82b5835ccc2d7b6cc0d22c5d8682f685de113a644712c5f7d8
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD cargo-license-0.3.0.ebuild 1315 BLAKE2B 39dca0964ab841c79da7334eb5639cd3c01b3adb439b7aa13f2ec2736269351a64768974b2393eac45548c6ffb16289ef50ae2c070762f74d8634da181991e2f SHA512 9d6556a2db4a9c16cde18b308d1d870b1639ce29e7cdb16f9877d4d15c93e8c56f9a9eb4a133ec573a9790604ce3c665b5628fa623b65a7974820133f37abc36
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-misc/cargo-license/cargo-license-0.2.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
index 8816d1dcb0a0..d140a5b79970 100644
--- a/app-misc/cargo-license/cargo-license-0.2.0.ebuild
+++ b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.2.0
@@ -6,25 +6,30 @@
 EAPI=7
 
 CRATES="
+ansi_term-0.11.0
 ansi_term-0.9.0
+atty-0.2.13
 backtrace-0.3.40
 backtrace-sys-0.1.32
+bitflags-1.2.1
 bstr-0.2.8
 byteorder-1.3.2
-cargo-license-0.2.0
-cargo_metadata-0.6.4
-cc-1.0.47
+cargo-license-0.3.0
+cargo_metadata-0.9.1
+cc-1.0.48
 cfg-if-0.1.10
+clap-2.33.0
 csv-1.1.1
 csv-core-0.1.6
-error-chain-0.12.1
 failure-0.1.6
 failure_derive-0.1.6
 getopts-0.2.21
+heck-0.3.1
 itoa-0.4.4
 lazy_static-1.4.0
-libc-0.2.65
+libc-0.2.66
 memchr-2.2.1
+proc-macro-error-0.2.6
 proc-macro2-1.0.6
 quote-1.0.2
 regex-automata-0.1.8
@@ -32,15 +37,23 @@ rustc-demangle-0.1.16
 ryu-1.0.2
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.102
-serde_derive-1.0.102
-serde_json-1.0.41
-syn-1.0.8
+serde-1.0.103
+serde_derive-1.0.103
+serde_json-1.0.44
+strsim-0.8.0
+structopt-0.3.5
+structopt-derive-0.3.5
+syn-1.0.11
 synstructure-0.12.3
+textwrap-0.11.0
 toml-0.4.10
-unicode-width-0.1.6
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
 unicode-xid-0.2.0
-version_check-0.1.5
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
 inherit cargo
@@ -49,14 +62,9 @@ DESCRIPTION="Cargo subcommand to see license of dependencies"
 HOMEPAGE="https://github.com/onur/cargo-license"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="Apache-2.0 MIT"
+LICENSE="MIT" # Update to proper Gentoo format
 SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
+KEYWORDS="~amd64 ~x86"
 
 QA_FLAGS_IGNORED="/usr/bin/cargo-license"
 
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
index 431cf2c46cfa..49d738ed18d9 100644
--- a/app-misc/chkcrontab/Manifest
+++ b/app-misc/chkcrontab/Manifest
@@ -1,5 +1,5 @@
 DIST chkcrontab-1.6.tar.gz 24701 BLAKE2B a4a47e0e41a17a535662b22deb57dd49b461694f4842a59a1a9debe8523f4216f4834c64d01c62e24e13ee4d45e526f361650b402968a164b2802e0a13d63a63 SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b
 DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
-EBUILD chkcrontab-1.6.ebuild 521 BLAKE2B 26194262fa7bd3c2bb50ede9d9583a7b2aa06775a5ab830e49d59bb9222c259abc2e85ece099154f84909dc821b3ab5eeab89345eacf27cfa581ef20100d4061 SHA512 12e06bd8d4770c42df0910e77ec9916a12a1271dbe6db8babd0dba38fe2529f395388996fea167b9bd2e94dd4a18ef9aeeefa83205e71ba640c13b292e7ed977
-EBUILD chkcrontab-1.7.ebuild 532 BLAKE2B 98022d076f7d011afa3b8134f8758fbfdcc450c32062a9f5ff8e4f14f9491d3e50cbd743a8b8155c4bd738f5dbd765d0bea12defdee5bcb232983428547f1835 SHA512 018ddb6113c89d8a0b2e55d2701357c19e2c6a4f9df103c0ad04e542af46038af13461820182061ddfadd79959838fd7c5c1759baec205ee641555c53b6dbdd9
+EBUILD chkcrontab-1.6.ebuild 548 BLAKE2B b2c584e4f18c7f9eb1cbf014f64f94955db3dd4c4680917c22ce176f9fac6bf99cff7f68074a5437d52176ade5c336f5c748a59e4b1d561594a444b8b65c1944 SHA512 7c27ca8f5b5f30ae93a95fdc68836d2002e766e0390e2e7a076cd28d1cd2f29a9723eea8a35f9157df900a64340c3a9157d37f6a200d2da22295abce5cb9ac63
+EBUILD chkcrontab-1.7.ebuild 559 BLAKE2B c2d5be5a8970988899a757ea8bc27ea87a88e41918f59e01369b09611452aa279fbca4020d56fc0dc14efe1a4d9a112d4c89fed23f4b1d0b77beab4c7a3da215 SHA512 42fad005cc9e4d43963a399512d161af8862491568b08ba5644f7dc53a852856974bcd249a43ca95a3d5ca549d58ec58d505f2e905352618e41429f370735bf8
 MISC metadata.xml 463 BLAKE2B 82e0b38cdc6aeb0cb304f3448f326c129e5b936ff559e07e5ced9b1b72e840cc4f1573571eae46cc56639f6920e717e7d3f67eef6cf8aac5e9a11f5948ac70ca SHA512 d181e1a0b06519224d4e6b13b7157bd9741000c676e7f47c72dd27eb475d991a32480393bd62a599fb0a833908bae96b810fbdb17723723067edc6af3b3ab0ca
diff --git a/app-misc/chkcrontab/chkcrontab-1.6.ebuild b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
index 1d14ba22d192..3ba987e07fac 100644
--- a/app-misc/chkcrontab/chkcrontab-1.6.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 python_test() {
 	esetup.py test
diff --git a/app-misc/chkcrontab/chkcrontab-1.7.ebuild b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
index 44293532ef89..2c96fd2b7630 100644
--- a/app-misc/chkcrontab/chkcrontab-1.7.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 python_test() {
 	esetup.py test || die
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 17c59e1e387e..a1ef25807fa2 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -2,6 +2,10 @@ AUX ckb-0.4.0-modprobe.patch 3049 BLAKE2B a144c5f7c3f1e8871fa4074f5cd36ba9b6664b
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
 DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
+DIST ckb-0.4.1.tar.gz 845316 BLAKE2B 03b6d09ab9297fea30ecff5485fcb33d7ad00335b25ce8bbd7727db1b794c7016a8f161562b5271e29fcefb332b50797d91ff8c09724b96b8929033763ad6624 SHA512 294a29146978c722fdfbb9c2581ed3fc492b2ffead0de8c434bfe90e6aff6e61748517c0f98ae0d8747e7a95684cf22badf778b35358dbaa8acbc18a25ade993
+DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
 EBUILD ckb-0.2.9-r1.ebuild 1188 BLAKE2B 31bd8b6247e0f3615b9f2a770e60651ebc3962390c1fb73c39138269acfd9daf30845c70a04c123a358fe52bef07933c618e748076a28bc3b7b79375374779bd SHA512 18531d54b89558b00ada031fd161f96f56105ace63b300db85aa699408184668aab56a9b21fec7c214df232525c5bbe28097aefe3bf7f1b63c650ffa0068f644
 EBUILD ckb-0.4.0.ebuild 929 BLAKE2B b29439748d07eaf2de1b48f473df25edeea66e460fa3770d024a13b8f3fe51d2586a7eb2944bc4d4560b6eb68c93182f5a8b15147b498d9fd4c12e7773a14d1f SHA512 79751bab8d45a33cbcadb17043623516a2ccd8dad6977e05d62564ecf2b19d7d387bda283b216c90a3207f9f84dcfbce431f49853266be294403e4593eedaea3
+EBUILD ckb-0.4.1.ebuild 883 BLAKE2B 8d533915088e7206c86c6f471bc706621416f21ae7eb05983eaa9835af968fee54cc3a7f7afd83c26bcb7561e513075b6b74778a24026a1da8316aac6ce4eb94 SHA512 baf2bd6325e50ec524c21911ec9ff9e961c14ed90ae6da0223f2fec17a34ec407b5474065b3db20ce2577b13b7ee6497d5682e0ea240a08f4eaa5c12cbe91c2b
+EBUILD ckb-0.4.2.ebuild 883 BLAKE2B 8d533915088e7206c86c6f471bc706621416f21ae7eb05983eaa9835af968fee54cc3a7f7afd83c26bcb7561e513075b6b74778a24026a1da8316aac6ce4eb94 SHA512 baf2bd6325e50ec524c21911ec9ff9e961c14ed90ae6da0223f2fec17a34ec407b5474065b3db20ce2577b13b7ee6497d5682e0ea240a08f4eaa5c12cbe91c2b
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.1.ebuild b/app-misc/ckb/ckb-0.4.1.ebuild
new file mode 100644
index 000000000000..b9d31b54b0ea
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	virtual/libudev:=
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/ckb/ckb-0.4.2.ebuild b/app-misc/ckb/ckb-0.4.2.ebuild
new file mode 100644
index 000000000000..b9d31b54b0ea
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	virtual/libudev:=
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/cstream/Manifest b/app-misc/cstream/Manifest
index 044fb50c8c61..1f6cb923f084 100644
--- a/app-misc/cstream/Manifest
+++ b/app-misc/cstream/Manifest
@@ -1,3 +1,3 @@
 DIST cstream-3.1.1.tar.gz 96609 BLAKE2B 360183c215e4aaf536d6455393b8e5a27fcfb15dc581205e53c0a160c97d028165cd9c24feea13f9a4ed11de1710ffbd1d548cadaa7fdef912eb1ee932a49ee6 SHA512 8d6364da622711f6888fd221b2f36f5da23d2a562d5a797d58d7ef361415481de8ab9ae55ae856d47c2d0141d570e22a61ab0ce9954c043877196df168f2f43a
-EBUILD cstream-3.1.1.ebuild 589 BLAKE2B 31d37e60f992ea54f3a47968d1c05e4d62f5294ddc5d539f91b14bd985a72b9d518b7dfafdef156a5cbfb1ec4ffde26bd0a985c92754fa826340b52723b9c10c SHA512 861a2f99e48c7bf55d9c45c3a691e56bfbf26c0994004a57cfa799c5ae4d0cc98d3783c6477556b5a913c186a6a128bcca2c6eae80a6d6cb125bb1dd165244d9
+EBUILD cstream-3.1.1-r1.ebuild 455 BLAKE2B a2885f659ddf5f8d7e47bf2d2757e05e9749c0822d0a6afd7e5b8047409c7b4f81b31bd12477020dd4b2d773c416c2638c32c637eef7c2031b081f00801aa802 SHA512 5d1b2608e8eede8e810d042c47101b149a6fd8b8b97b231cd63a7d2db46a9cb3e13ff1b7a11c046ec3858faff24e91bc06c40270e9c8efc6b214fcd9edaf7bbe
 MISC metadata.xml 1733 BLAKE2B e33cd8b44e4d1dc0f37c60d95d1bda270d3ce7533dc2e031bb23b6a73c1a362091ab780d0a541eaac1572fa2987a30026877f91e48189818218ab8ac75285c1e SHA512 c3609fb6e7fa87dcdd924cdad07d5d9121ace333ca87fac64ae701d97f74a09d4f6788cf82793f8ce579f54b6872fe379d9f758da170ae80d770c1306106b882
diff --git a/app-misc/cstream/cstream-3.1.1.ebuild b/app-misc/cstream/cstream-3.1.1-r1.ebuild
index 17353ea486d6..dc7409c52f67 100644
--- a/app-misc/cstream/cstream-3.1.1.ebuild
+++ b/app-misc/cstream/cstream-3.1.1-r1.ebuild
@@ -1,11 +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"
+EAPI=7
 
-AT_M4DIR="auxdir"
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="general-purpose stream-handling tool like UNIX dd"
 HOMEPAGE="http://www.cons.org/cracauer/cstream.html"
@@ -16,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 src_prepare() {
-	# this file does not regenerated automatically by autotools-utils eclass
+	default
 	rm auxdir/missing || die 'failed to remove auxdir/missing'
-
-	autotools-utils_src_prepare
+	eautoreconf
 }
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 3fd8a18790c8..9d46df4fc290 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -3,5 +3,5 @@ AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9d
 DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 EBUILD datefudge-1.17.ebuild 950 BLAKE2B 82720a9c28feb654e55136aa0c1b31aa35e4e67363c7502bd1baedb544c9f51974784a0071b438b930ac35a5747d052809d6e47602f4f6b074e6436289e69d33 SHA512 269894aa7d6226bf88c25b5b38c9e1283ecea5fe2ca2850ecc848eafd16c653d7f7dedd4d81b777ede2e7b03394834e0c8233939ac3e02fa9d0c5e8a216b3096
-EBUILD datefudge-1.22.ebuild 989 BLAKE2B a633a3ec1d41f01f70f6c306b6553e63e5357514333072075a83e8b121f11b9a21c8a08c164b1575f1c4654d9db66b3da3464c4d122c19bb0384048c0daf9811 SHA512 23ad20ee114e5089efe10a8c4735ad5695ab12d99965dcfc4d9e219fb342aaf04d416f93bd7c33742aa7d277b091a0c8222f486e2bb584f5f2a08c0c2d340063
+EBUILD datefudge-1.22.ebuild 977 BLAKE2B 80f5b040dde266aae12e8978d890d387d352e4abe01557c9789ead3325fa5d96d140bff00ea08d28ed949130ee7b78c9113fa5811930ed297442b63cd732e06c SHA512 7b8f5e733b250f2c13802b60b745612cabc4e757b19ccd6aa3aa3956f413bc079288115f3eb1f2b0758134998f5d730bb8762b04e571f0b8daff35a9d11a2f6d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index e3ffe7c750c1..02c2bffefd61 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index b8d9b3ed6fa6..15878e37db3b 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,4 +1,4 @@
 AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 EBUILD ddate-0.2.2.ebuild 514 BLAKE2B a8a35a87f6df49c2a907bce74ed184af0720308265bfee13e7d4fdf9c95ad2477530a1be92e98877e6c9b2d5d1fda1752f0df61216877204a7b583f7d2c66e5f SHA512 c75d4c255ce6455cbbc249b40c99fcfa5d358534b3485843a652e264048f5c4933cbbe9e148e3266252ad3e7598546fbfa2d5d0b263715746d3fe8e1a784e236
-MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
+MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009
diff --git a/app-misc/ddate/metadata.xml b/app-misc/ddate/metadata.xml
index 5326117a6b34..6c3ff23a0ce7 100644
--- a/app-misc/ddate/metadata.xml
+++ b/app-misc/ddate/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Converts gregorian dates to discordian dates.
 		Sacred document of the frogs (old erisian poem):
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index ad898f9faeb2..4580536db65e 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,3 +1,3 @@
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
-EBUILD digitemp-3.7.1.ebuild 1840 BLAKE2B ff43d430f02c99fefb016759d955dbfb1c86de399cdf791bf121790b62b333b3ab044d06c42c53404b7f3e8b5b0119d4226fe35fd4380912f5160d08364776f7 SHA512 8ff41f59044c5b118524e9b7304d756ab1ec58e802ec936b664d0fa618e4f602630a734fc46573d98116293f099c3f929d805311e9961f4d18c54fb83036512f
+EBUILD digitemp-3.7.1.ebuild 1808 BLAKE2B 3a81fb123fe2cef98264968f31abd4b41672b5825d96baa75ecf87070d91cdfb785e6521195d3d41f49a2d1d717b60321a906569f9f2cf0e43cec9033fa98754 SHA512 4d0bce875ed4bc7cdbc985d9acebb40ec74740a5c0caff5aa063b0178780b89b8c7b5abfeaabe2d03a70e10da07c3134335426ba198ca86e280b21aa51ab5687
 MISC metadata.xml 982 BLAKE2B 9a74eb54a17f249dd527e5aa4b292dadce934da1d1303ba6ca3bb5503c5e235836261495af1eb3c04e0322725c46838b1c902e8f5862856edb3696a147a74184 SHA512 8dda9bc7dff244e54e4951d553f2255bd1da1279221374fc514b5483e36ae129fc9e154c8bf07bf66b3ddc9b2bdac172184b3d9b89c06852f0f9f2237de627a2
diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
index 6fd05c710080..01e1ebe0ca3a 100644
--- a/app-misc/digitemp/digitemp-3.7.1.ebuild
+++ b/app-misc/digitemp/digitemp-3.7.1.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 
 	for target in $targets; do
 		emake clean
-		emake CC="$(tc-getCC)" 	LOCK="no" ${target} || die "emake ${target} failed"
+		emake CC="$(tc-getCC)" 	LOCK="no" ${target}
 	done
 }
 
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 98d233694962..79faccdbc11b 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,4 +1,3 @@
-AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a3680077fc5baf1c55e0298bc772a4987efe2723a01d0f8b3a295173c8fe92c5d066993f9946b6b4beae80cc2de8aaebae8 SHA512 64ab0e8384e4f04e43b8565440b0ec3f0d43b87e142cd15dda0eec2b320aa3e8ed437524dcdbd390b83f4cb39c13df3575318be4de5f8eec50fb710c9ec1170b
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.9.ebuild 455 BLAKE2B a9cc8ac912ea0839916c82b2d2424857374b8cf18a427ec649a90594372ababba6675150c03aa842f30f12a0efa906e38c3447066e45a35a1e4ac7224943d8a7 SHA512 081db08009360a8eb87875f122a849ed89115ccd90d0444a55ae9f54688c79f13a54f79d7dbc74ac8e890301e0116a8d50a71d1e8ef4bea2fd38520e5cd527ab
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch b/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch
deleted file mode 100644
index 82d5f0e1e159..000000000000
--- a/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix error handling for read from stdin in attach.c
-
-attach.c did not correctly handle a read from stdin when read returned
-an error. The code assigned the return value of read to pkt.len (an
-unsigned char) before checking the value. This prevented the error check
-from working correctly, since an unsigned integer can never be < 0.
-
-A packet with an invalid length was then sent to the master, which then
-sent 255 bytes of garbage to the program.
-
-Fix the bug in attach.c and the unchecked packet length bug in master.c.
-
-Report and initial patch by Enrico Scholz.
-
---- attach.c	2012/07/01 21:26:10	1.12
-+++ attach.c	2012/07/01 21:44:34	1.13
-@@ -237,12 +237,16 @@
- 		/* stdin activity */
- 		if (n > 0 && FD_ISSET(0, &readfds))
- 		{
-+			ssize_t len;
-+
- 			pkt.type = MSG_PUSH;
- 			memset(pkt.u.buf, 0, sizeof(pkt.u.buf));
--			pkt.len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
-+			len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
- 
--			if (pkt.len <= 0)
-+			if (len <= 0)
- 				exit(1);
-+
-+			pkt.len = len;
- 			process_kbd(s, &pkt);
- 			n--;
- 		}
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 76c7503cb38e..c77cacf7e61b 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -3,8 +3,8 @@ AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d81703
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.14-r1.ebuild 1527 BLAKE2B 43ab1e43a55d399c801e328368b11c31f99111d2573c723150b0afffd94ebf477e5d17b470eb915dae374ff208e99fed8be85613224657567d136472503f08d5 SHA512 5909230c679470ed169370fdec465f07965934df68446dee6c3bd8312c6cd36ad38fb5a728a3396853abe48e191a8e081db38a3707878958517f82e83d19f45d
-EBUILD dvtm-0.15-r2.ebuild 1280 BLAKE2B d97bac0c3363f068dbb02a464db283cb543e326320615b8062f52e265cf9e738dcbae80a60d40901424f23be18b4b4e832bb9f113ddbd77b5523f5fc301f1383 SHA512 5057a1e1d31f940e71abc9befe7bccf5ea913a1679566524d7bb88ec6aa1a5df27fd01299a47b57c610c87875f94535a37b78f85a650ec4a2f8539d7ba04e374
-EBUILD dvtm-0.15-r3.ebuild 1275 BLAKE2B f498d1be6683e96a8357942b624d204f1794d409f7229b3dbdad4fa1a1ca96c042c33f14d9520accaf88aa717910b58e88304654a1a23a07757211d4e13a309e SHA512 f9f15c4ea40a662437f39a5728ff9d2e90814afd6e96aaebc08b4922dfadc59308242fe50d9d67e0aaf7c2915c39e90538cefd64dc12c0ceb62e0051691cc1a2
-EBUILD dvtm-9999.ebuild 1279 BLAKE2B 3bfb84aa483fc756132d4a51d1662365cb059393c365781c62ff5e4a462f731b6984dbd1a6f8112132c7738e3e13e596d3a141d9641ee5150538ee15efccdcab SHA512 8511e37e945f0fffacfbacb5a6bb0e850a2e72a06365e1fc4f8ca627d80788ce646212f13abc9bc782cec844d599302249f78cccd50c3e9ac74f0169388466f0
+EBUILD dvtm-0.14-r1.ebuild 1499 BLAKE2B 49e023f5e5d59597de5214f0a374908349d733b6e4ed51d9eae3ef7b612fc9325696b3da822102c1e3155a77bd3ffd4ea9ae776443edba4038699c252b3cce17 SHA512 c904db8a5cf986a1bb3cf48708fe43bcd501d52487b0a410ffa16b1feddd4533c9dcf0e1d4b9b3baf118f662ae7f17b19e6d32b6b7bb1f9a8a1acb210085fc16
+EBUILD dvtm-0.15-r2.ebuild 1252 BLAKE2B b614650745ef0d502cf9c8ec66cb1e491f4b002ea40a12860353bf62fb1fa91dfadb7f276e527ccbe751229358ec376d3174ff84e6337519b3fe8598d17c0029 SHA512 7cb4060410bb7b4282477268637362e2c5337992941155621651972064d1021502e643184d769336eb465146dfb2a000d33ce43c632eb93b76223cc92a8ac4c8
+EBUILD dvtm-0.15-r3.ebuild 1247 BLAKE2B 8c04394660d30f532aebce68a1a23ccdaa5d0a89274d293785231aa24072506210d32477df448bcf578524fc6f8a60955cf76ce58beb4e39a092df38257fb9ab SHA512 192554add146d8214aaad50676369edf0cd860a0483c848cc50388c0edf5de1180a398df33278b588f20e5bb137b3ef7725c319355642c821a6dbe024d7de33f
+EBUILD dvtm-9999.ebuild 1251 BLAKE2B df136b7502f1845791061909b9cbc1d6c8c75867dac56b47ceda726430e69c85796c265cafddf9c853051243706fb49a9d299518556cd67d446822f4c8f0e638 SHA512 81903f29b1358bb1b9dc4d3fceee38ac1b05acc5cb46d4fe45a9be03ceea7a2a919649144c62f2d94eebbab9d11ef897c069df17ad38f7cbda0184277da06b26
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild
index bbd504088eee..302a81e984be 100644
--- a/app-misc/dvtm/dvtm-0.14-r1.ebuild
+++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 src_compile() {
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+	emake CC=$(tc-getCC) ${PN}
 }
 
 src_install() {
diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild
index bc1f7d84a70e..6c0a09bddd82 100644
--- a/app-misc/dvtm/dvtm-0.15-r2.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r2.ebuild
@@ -41,7 +41,7 @@ src_compile() {
 	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+	emake CC=$(tc-getCC) ${PN}
 }
 
 src_install() {
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
index 08f42e49fa3e..e31217f2b0b0 100644
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+	emake CC=$(tc-getCC) ${PN}
 }
 
 src_install() {
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 64b9d7335b2b..8de03bafd8cd 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+	emake CC=$(tc-getCC) ${PN}
 }
 
 src_install() {
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 9d3bf9cdd3ff..e364ba0e7aec 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 865 BLAKE2B 87a3b158cd13c0430602657c4dc6ded9e3a24678e9d5fcb5cc4f4b662ed9c75770f5860653ed1967837e4f0dfaedb430d4463a31c449f1e0785f234a25b2b156 SHA512 2b503f30c0cc23418b388e5f8449af4aa71ab24cd4a03dd4db2dbc372ab490e36e8c1a91b3632cfdcf3029539ca3f07672b760e315db05783ad142f78967c43b
+EBUILD editor-wrapper-4-r1.ebuild 933 BLAKE2B a53ea6a210b95f226405e9ab470a0f6175edc4f0e348d3c95177440eff53e843d60c1e80ac6ddbef42589c371168f93461360bea794d38f0483e9586db52f80b SHA512 1e930ee7c26349537379d7cd1f3b957d23b86ef8c0291e0b2c2f08c8b8f2bf318e6fc74c4476be75f78841266226230d171fe8cf676b0b79cdb16e689bc1e169
 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
index 2b944870d40f..ae6d5e1ad4a1 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
-HOMEPAGE="https://www.gentoo.org/"
+# There is no upstream, everything is in FILESDIR.
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-misc/enum/Manifest b/app-misc/enum/Manifest
index 5eba1c497f85..adfda6e76a0d 100644
--- a/app-misc/enum/Manifest
+++ b/app-misc/enum/Manifest
@@ -1,3 +1,3 @@
-DIST enum-1.1.tar.bz2 100815 BLAKE2B 921a3c1be5dd91ead83366f1f094c8e50b00e9e58bb3316301a9a162255b55b8104ac09ae5913596c6bfb2b58a3358734950073f87fc8bebfb241a8e6ad0879c SHA512 06396c5286c1e7b725c7cd7952713e21eaf917d586a3f069f2faedbf2fd191f2703ac7e67db563a54978542809552c71eda6a238a22fd2a8928d134ec471e931
-EBUILD enum-1.1-r1.ebuild 604 BLAKE2B 43664ee6ef5fb5632d2c092105b714f8f4256a8be6be87785afb072c12047e1b57c2633a324876297e4405e946d797287c81cb03d619a8dfec84c371553be9e6 SHA512 6e382754401a11308dfbb6c1d74698397aab204fac86f58b8b6470a0bf64a9b43475c1ae40a92a53c8b4613b7780fbff015d5bf4dab8f5ac99bb6f31f5530236
+DIST enum-1.1.tar.gz 59849 BLAKE2B fdccdf3a362b3a6f7727c76eb50e4d568b2c6be85fdb62af6f095655865708102e578bb3e4988fdcbb542b2397aff5ad024b89c0cacb120d676aed518bbfcaa5 SHA512 4d2885ea8d3d24d04360b32241517152ab25480c5346917e1bfb483dd0f50ae5a6cb8b4ca3552c04bdb0d5960b1e83502ce4d154fa8316b0e0ff5eae8aac3648
+EBUILD enum-1.1-r1.ebuild 704 BLAKE2B d4fa649149cdf3ed7c545b2d6e7104a42ec6a0c064f9f4a7f2fc40e7f226fc6101e801a9d29790c941fb2241c69361339140e126f5aefec1df2bb290f2d512ad SHA512 4b1dee70108b9f5fc5a6159292a68764bfe55f2c728e6b4a9c562ff63acfb4115bcfbb55b054f35417edc3ba4a4e7c8411503c4608d1d9b52b82fab70be6fe9e
 MISC metadata.xml 327 BLAKE2B c4c87de1c4b70265f16d5e78197870b902605cf9cc334a4e0064fdfd3e15a6e01cb9013ca296b8e7ecd805d536dd375925ddcee49f80b1b4125762f971035a04 SHA512 e76ec4d0ea0a8a0c914f41578a52cd0a31942e75f13c3b0f3bd290a86c989f93cae9f5d76ab085acca6a5bc16cfb52429478034a48b9daadc4c95162b11f40ee
diff --git a/app-misc/enum/enum-1.1-r1.ebuild b/app-misc/enum/enum-1.1-r1.ebuild
index d125d71a5035..b18fabf94a6a 100644
--- a/app-misc/enum/enum-1.1-r1.ebuild
+++ b/app-misc/enum/enum-1.1-r1.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Replacement for GNU seq and BSD jot"
 HOMEPAGE="https://github.com/hartwork/enum"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
-
+SRC_URI="https://github.com/hartwork/enum/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="app-text/asciidoc"
 RDEPEND=""
 
+DOCS=( ChangeLog )
+
 src_prepare() {
 	default
 
 	# Remove bundled getopt
 	rm -rv thirdparty || die
+
+	# Workarund automake issues
+	sed 's,\(AM_INIT_AUTOMAKE(\[\),\1subdir-objects ,' -i configure.ac || die
+
+	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-doc-rebuild \
+		--enable-doc-rebuild \
 		--disable-dependency-tracking
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog
-}
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index baae31608c58..2d02094c4780 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,6 +3,5 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
-EBUILD fhem-5.9-r1.ebuild 2319 BLAKE2B bc4f2e8a158ffd94e91e3c46f5996c65aad88822eb85fc0eb24ed26d876cc68293fd69f63191d5cab4b91dcc150f820b0ac7efe97b7eff22855c939755f47112 SHA512 e2f158ca9cca738c2ca33717b5796405749691b86092fef50d2fc36dce047cb9e3f19e4d48162c0912ca9f4262f0b66613ac1a9fa7dfe14615b634f1f0c60957
-EBUILD fhem-5.9.ebuild 2357 BLAKE2B 34b77071183e346285896e9f608c364939d8b1056fbb295af41998057d45d998e10c55dfb39746510e85cf3a2901d1f628033ca4f0f4b6567dfe50b2f0ba712a SHA512 b365555c87e53a4370e655dc37e3e590a7ef7a72aa239aa4b243b6c193d2823e49cb2e5976d8109949e781a420316e528e1efc2412a7703e394de7c08d9c9493
-MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
+EBUILD fhem-5.9-r1.ebuild 2317 BLAKE2B e49fb1a0c0819ac6ffef3e077207a5e8710f76ddca3c8adccd1de0331a9f5502392cc89e19822ea2509cc0b772e08e1ea61aa729f544a2c4abdaeb15dae48498 SHA512 9958582935a807f7c13a2500dcc06b19c137d8cce14c19423316833731d1c861d85e1d21c885eaa9cd0528bd18341454998ffab8a8ff7644f4d5ec088d9aa0b1
+MISC metadata.xml 648 BLAKE2B 7d812ebc3a0e960a7a3eb744d339820af256c558220e3bc3e041751a253890be6227f7b6a19df7ceec363318800c18838fa6923a0d5c71049fc1352416d6d9f7 SHA512 4518524695a6efbfe86db125d625bb5fe58174c74968e336a34f648bf2784832eea99f322e340c922aca9c5ab43d50f3f4d0334377eed4447ea1f3c5ea6e995a
diff --git a/app-misc/fhem/fhem-5.9-r1.ebuild b/app-misc/fhem/fhem-5.9-r1.ebuild
index 7d804c1d86e6..358a510f2496 100644
--- a/app-misc/fhem/fhem-5.9-r1.ebuild
+++ b/app-misc/fhem/fhem-5.9-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A GPL'd perl server for house automation"
 HOMEPAGE="https://www.fhem.de/"
 SRC_URI="https://www.fhem.de/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc"
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
deleted file mode 100644
index e84340e0b59c..000000000000
--- a/app-misc/fhem/fhem-5.9.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 systemd user
-
-DESCRIPTION="A GPL'd perl server for house automation"
-HOMEPAGE="https://www.fhem.de/"
-SRC_URI="https://www.fhem.de/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="dev-perl/Crypt-CBC
-	dev-perl/Device-SerialPort
-	dev-perl/Digest-CRC
-	dev-perl/JSON"
-
-DEPEND="media-gfx/pngcrush"
-
-pkg_setup() {
-	enewgroup fhem
-	enewuser fhem -1 -1 /opt/fhem fhem
-}
-
-src_prepare() {
-	default
-
-	# Allow install path to be set by DESTDIR in Makefile
-	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
-
-	# Remove docs in Makefile, as they will be installed manually
-	sed -i -e 's/docs//g' Makefile || die
-	sed -i -e '/README_DEMO.txt/d' Makefile || die
-
-	# Remove manpage in Makefile, as it will be installed manually
-	sed -i -e '/fhem.pl.1/d' Makefile || die
-
-	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
-	rm -r contrib/lcd4linux || die
-
-	# Remove log dir, as it will be replaced with a symlink
-	rm -r log || die
-
-	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
-	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
-	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
-
-	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local DOCS=(
-		"CHANGED"
-		"HISTORY"
-		"MAINTAINER.txt"
-		"README.SVN"
-		"README_DEMO.txt"
-		"docs"/*.txt
-		"docs"/*.patch
-		"docs"/*.pdf
-		"docs/changelog"
-		"docs/copyright"
-		"docs/dotconfig"
-		"docs/fhem.odg.readme"
-		"docs/LIESMICH.update-thirdparty"
-		"docs"/README*
-		"docs/X10"
-	)
-
-	if use doc; then
-		local DOCS+=( "docs/X10" )
-		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
-	fi
-
-	diropts -o fhem -g fhem
-	keepdir "/var/lib/fhem"
-	keepdir "/var/log/fhem"
-	diropts
-
-	dosym ../../var/lib/fhem /opt/fhem/data
-	dosym ../../var/log/fhem /opt/fhem/log
-
-	default
-
-	newinitd "${FILESDIR}"/fhem.initd fhem
-
-	systemd_dounit "${FILESDIR}"/fhem.service
-	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
-
-	newman docs/fhem.man fhem.pl.1
-
-	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
-	doenvd "${T}"/99fhem
-
-	fowners fhem:fhem /opt/fhem/fhem.cfg
-}
diff --git a/app-misc/fhem/metadata.xml b/app-misc/fhem/metadata.xml
index 92b432980845..97fe0546fccc 100644
--- a/app-misc/fhem/metadata.xml
+++ b/app-misc/fhem/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		FHEM is a GPL'd perl server for house automation.
 		It is used to automate some common tasks in the household like
diff --git a/app-misc/fr24feed/Manifest b/app-misc/fr24feed/Manifest
new file mode 100644
index 000000000000..037410aafb54
--- /dev/null
+++ b/app-misc/fr24feed/Manifest
@@ -0,0 +1,7 @@
+AUX fr24feed.confd 182 BLAKE2B 10edd368975b775273a7269da6d554c4321b910f1383a9892a0b9ec2c24d776b1f679e541ad3d59a2e3fb76560341ed88debb01ad037f548663ad993c5894fbf SHA512 c614df857f630dc1bea0d7174ae7a26fceda73d6e793609c90d23478e4bb947b45e09f6f17873c22b8888b33bc738d6128466ee09fe4ea885ddc6c31f5188e25
+AUX fr24feed.ini 15 BLAKE2B bb6e818c0ee430ca84bbc59688a6087fa50095521d7c7e8cd799d5bd2b0f7607c056dc826b0d71571f709afd35fbd4808cd54480b4bcb0ec68c024c333ae04f2 SHA512 b3b9f0597a74f29da5c0308c9acd0d42a0d70165aa3ef53f03c7412dbe69a8d7472111c9ab273c93aa7ef06f9146555f4b3255d2bcbc2b3b356db867998bc186
+AUX fr24feed.initd 618 BLAKE2B 5e7a6cf2160be2cce8f5779b2fd6613a2cc4d8e754a8538cf5d6ff39e434ed97b5763ec76ed97a1cfd1e36e3d9884b63604e770368668cfa1ad9f0599f08e928 SHA512 8bc686237a15206569aea00a68e3f6bbf97036915c23781a122831b43ac3045e12b440f565d862b25ff3b453fc17cd32a026cafc7e4409aca6dfef0514901528
+DIST fr24feed_1.0.24-5_amd64.tgz 3943670 BLAKE2B d8d7b031872c1220f2f6ba5843d0c457279d393ae78dc947fe5cbc81e5ee1d4bf629ecddee093020ed3e01937fcecd9f225dcfd5c55fc47e7a31a23007122a18 SHA512 9ed5391e7faf1ab3352b95d6eaab8cccd77f0759e4852c3e0283a930d8f7dff2f38c59eb00639a2be0c6decd9f4db49fcdefb6b3de3533b8453a02f66224d503
+DIST fr24feed_1.0.24-5_i386.tgz 3645172 BLAKE2B 074d6535d09ab77baa9d954bcd9c87c3099b6938ad57ab67f16b14a6a8f865868eb3d82b49eeb6559a6929f8cb28f3591563f007490dd45782b4452cf2da12f2 SHA512 05d9a7ad64e047d3b2934d6421d1fcfb8aa6eb955739f9fa58726d2e45cb7141fad73ea1943ce01a071077a8155e07672acade75ce9068d5c932b0b24ff2b194
+EBUILD fr24feed-1.0.24_p5.ebuild 976 BLAKE2B 65287a4a9bacd9a66af8f0c876fb4e0a3d4cae306416ce7f6c3e92118357549e8c449e04078e4ef76220bcf8ec0e15275827c70d4570f4c97675728a43c9ef66 SHA512 2880bc1489c619646984e9db573dcf977e3c6a57f5147d2f146da756ca39f3296ed0d9f8f5e9f6ac7e8d0e02ccf94de9a0ef577c5a7eca5deaa587fa216a4b77
+MISC metadata.xml 891 BLAKE2B 7f5e04b5c9a20ce764f8440658b14d3f125f92e90c57188456cfed899aa1b13086edbb322aa71dcae9d28a92c4044a7d7043304bd21646090fcc761f4b8c9583 SHA512 fb6aac498a44f91af213696ca370eb63f0fd19e221f53de9b1e16563f9bea2d8c32ed1f8aafe395dc606fcf1a406156f184f50529d5645bc40be507d831b5414
diff --git a/app-misc/fr24feed/files/fr24feed.confd b/app-misc/fr24feed/files/fr24feed.confd
new file mode 100644
index 000000000000..90288849bf59
--- /dev/null
+++ b/app-misc/fr24feed/files/fr24feed.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Pass various options to the daemon.
+FR24FEED_OPTS="--log-rotate=2 --quiet"
diff --git a/app-misc/fr24feed/files/fr24feed.ini b/app-misc/fr24feed/files/fr24feed.ini
new file mode 100644
index 000000000000..fdeb5adb6e4f
--- /dev/null
+++ b/app-misc/fr24feed/files/fr24feed.ini
@@ -0,0 +1,2 @@
+bs=yes
+raw=yes
diff --git a/app-misc/fr24feed/files/fr24feed.initd b/app-misc/fr24feed/files/fr24feed.initd
new file mode 100644
index 000000000000..a0f1b9aa6b93
--- /dev/null
+++ b/app-misc/fr24feed/files/fr24feed.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Flightradar24 data sharing software"
+name="Flightradar24 feed daemon"
+pidfile="/run/${RC_SVCNAME}.pid"
+retry="TERM/10"
+dev_shm_path="/dev/shm"
+stopsig="SIGTERM"
+
+command="/usr/bin/fr24feed"
+command_args="--monitor-file=${dev_shm_path}/${RC_SVCNAME}.txt --write-pid=${pidfile} ${FR24FEED_OPTS}"
+command_background="true"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ ! -d "${dev_shm_path}" ]; then
+		eerror "A mounted ${dev_shm_path} is needed in order to run fr24feed!'"
+		return 1
+	fi
+}
diff --git a/app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild b/app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild
new file mode 100644
index 000000000000..4b625d172962
--- /dev/null
+++ b/app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/-/_}"
+MY_PV="${MY_PV/_p/-}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="Flightradar24 data sharing software"
+HOMEPAGE="https://www.flightradar24.com/share-your-data"
+SRC_URI="
+	amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/${MY_P}_amd64.tgz )
+	x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/${MY_P}_i386.tgz )
+"
+
+LICENSE="Flightradar24"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	net-wireless/dump1090
+	virtual/libusb:1
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/bin/fr24feed"
+
+src_install() {
+	dobin fr24feed_$(usex amd64 'amd64' 'i386')/fr24feed
+
+	insinto /etc
+	doins "${FILESDIR}"/fr24feed.ini
+
+	newinitd "${FILESDIR}"/fr24feed.initd fr24feed
+	newconfd "${FILESDIR}"/fr24feed.confd fr24feed
+}
+
+pkg_postinst() {
+	elog "Please run '/usr/bin/fr24feed --signup', to register yourself as a data feeder."
+}
diff --git a/app-misc/fr24feed/metadata.xml b/app-misc/fr24feed/metadata.xml
new file mode 100644
index 000000000000..20445ea2d98b
--- /dev/null
+++ b/app-misc/fr24feed/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>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Flightradar24 operates the world's largest network of ADS-B/Mode S receivers.
+		This network, together with government air traffic control and other data sources,
+		is how Flightradar24 is able to track aircraft around the globe.
+
+		You can help us increase the flight tracking coverage in your area
+		by uploading data from your ADS-B receiver.
+
+		By sharing ADS-B data with Flightradar24, not only will you help make real-time
+		flight data available to millions of aviation enthusiasts around the world,
+		but as a thank you, you will also receive a free Flightradar24 Business Plan subscription.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest
index c4476e4107f4..3cb54f72c312 100644
--- a/app-misc/g15mpd/Manifest
+++ b/app-misc/g15mpd/Manifest
@@ -1,5 +1,5 @@
 AUX g15mpd-1.0.0-cflags-and-lib-fix.patch 746 BLAKE2B 9fce8bbfc245b8fafc638f31feca90dfa1939f6722c0ad31a8aec175c7f4ed9f755ca325e9309175d790a77012c76bd6cec7df29b0b13345ea0143aaa406c928 SHA512 79b24ec54f55741f7fb5a5a22a547e515b909e69253418de434c032179ed2a2f4e9397eabcc13de460d8c9219b3aeeafce387ba84cff17a79778ee151465b7c2
 AUX g15mpd-1.0.0-libmpd.patch 1460 BLAKE2B 360dd9412aecf2b805145263b9d021484eca3dfb966eec8b44857f263a5b5fbb31d17dfcec276d531c76ef4c1d1e4cdf32d598771b3c414df8bd2660bb6ea5b7 SHA512 240c82b84c4eba2095e6fcfd0e7da7fb54197afa600dcd0ce92b3eacc9f8907e69ac64e44dfa5314a29bc4db793f9e21f8efd44589c0a3c226426cd52445945e
 DIST g15mpd-1.0.0.tar.bz2 220482 BLAKE2B 82103773005566764bab5e8b583633a14b5103887ac7e4c3571cfc85064e483943189e6b4b76e8f3f3b7383d327b29a19b281f23364d3bcc18b10ef44de1e9b5 SHA512 509b634c8ba1f3b9efd0d7af47b553671efe3526c9acd44b292bf5883b1016cfbf18dec69c8bb5b3a35853e76b9b4fe7a51cd2a33acf4c755d2824dc793fa0ca
-EBUILD g15mpd-1.0.0-r1.ebuild 823 BLAKE2B 8023552468558f30ae1737d13b2eb27f4ff6f057b845f8631807ea9853f6e6b69432e28f5025aa478e0e04e9b3734666cae0b386f76ddd23455194b6490d9e7c SHA512 c3d0e6dbc656fba7c85ae7f43cfbc58e2ab43678d49ec662bb80740f166e573dff8cb9abd7bac4f301843e9bf999a000c78872f710f204228df83a42022affe9
+EBUILD g15mpd-1.0.0-r1.ebuild 793 BLAKE2B 2c68b3700cfb372e3787a6d1ca9070907cf0ea1313a7e1413502e43959b011251f904657f7df861243c553db02d810db90a7bffbc54cdaee65208c64c27091e2 SHA512 69d7c474440a80f52fa92929671c80d51e4e35e21649c818ed1fd713da95ce1c3af8bfcca0f93eb2542302bf9ec5c46ed7ee42cf2e63816bc26fd4fc45d50b9c
 MISC metadata.xml 246 BLAKE2B a95774ec5f588845ea4765db8b51d75fe0b71c04129ddfba9706afca19ebf4fcefa5bcee0c71b295d270de24e8942142d2af9449a46b7407cfc24a5797fb6885 SHA512 b9fd89855ed25a0b766566521a33295c6d3f4469ba31da9fed2d4f133d3c56b1a59e7c4cc66171ebf6c8a9137ccded19a942072f80dcded8b7efcf0912fdfce1
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
index 13ecc8900f6a..b7c7430f5385 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
@@ -32,6 +32,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
 }
diff --git a/app-misc/g15stats/Manifest b/app-misc/g15stats/Manifest
index 8f16c5b98a20..b04d7f2b5085 100644
--- a/app-misc/g15stats/Manifest
+++ b/app-misc/g15stats/Manifest
@@ -1,5 +1,5 @@
 AUX g15stats-1.9.7.confd 637 BLAKE2B d85597aba7b14048078a60a8b7e8d2c782f499d649d30c5c48ae09bc545a2ae1642ab1776d119a1d6fddb7317c94e13d85a888c09507608257bd0ac7b3ec37a5 SHA512 f31ea949d3bdc1c8c18628f31ef0252a8d07a636055bff493cc368db702aea2d0d23b6b812d16040cd0015c1daf25357e29149d74e0bb3f233560a15df5ca58c
 AUX g15stats-1.9.7.initd 496 BLAKE2B 52bed11f8b0c9c084c1e1c313ea629cfbde5964b21f6bf7a8667544de6e702cb4b5a89a4022d66d53abfb6f4c14b43669bef290ab6041720e193b96f9b9482b8 SHA512 ad61ddfdbd60bf8906c6ee114ed01385bc20480225579a2034296231feb211eddc48fe8a088ea314822972f80a6df12d3f5bbea44e4e649ea7156b241457ff34
 DIST g15stats-1.9.7.tar.bz2 24103 BLAKE2B ead6f95c1e320b975a0d3ace2c76c1244e5c36b5df60bb73133d19c2bab4f21e1a9d1c423baa9d87feae166861734c02fa60d7ec2e06a0ab764b77a0e00c7ba5 SHA512 de447dfddd563513205b29b3611b0558371b2a7fbe7bf3aa11cd997c0ee2767b3aba05df9745d15e5c0b81382b96163fb7d33ba6a77e04ac817c7a8e26e228ff
-EBUILD g15stats-1.9.7.ebuild 939 BLAKE2B f9505b164e560495aa5c6b767c6bbfd6cbcba0d334f01ddbab08366278a573731a6b6bd7460b5dd38300d329ff48413d89d823b6311dd1415b5c3b79dad76830 SHA512 4af56d975440631a8494737e2ce412811550ff24348a8ea3335c56036ae3cab6aaea7ab6f88ceb4f5c91b8684755359a5ad403e681b2ec9ced3dc6286e0ab017
+EBUILD g15stats-1.9.7.ebuild 910 BLAKE2B 0def83364b305ae2e39a8437007690e1d20a9ede7ae90b0fe4216466573ed18e960a2cd23bc1a5e0382ebfe743d4e57eccd354bf91a6a95b767972d7fdeb9a76 SHA512 d0cf3acce9c19f48381050e04f28ab18b7d396dee8000aae1b20ef69c2fdf71368e444862b61a3150e834cd92334e002e4c8792ca1d0eaa8834f9df9ccfcd749
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15stats/g15stats-1.9.7.ebuild b/app-misc/g15stats/g15stats-1.9.7.ebuild
index d28c95aee6ee..c46f9b7e499b 100644
--- a/app-misc/g15stats/g15stats-1.9.7.ebuild
+++ b/app-misc/g15stats/g15stats-1.9.7.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
 
 	newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index 7103a96f7ea5..ed82c5cd9d54 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -3,9 +3,11 @@ DIST gcalcli-3.2.tar.gz 1672457 BLAKE2B f54e90cbff2676238a4e5d41fd5d2935b4835874
 DIST gcalcli-3.3.2.tar.gz 1674569 BLAKE2B c141bdba5a337ebc4ecc81f845c66281ad3d5b5442a664f195bfdcf866eb1c0a1f7c395808d939caacbf8af74bf8f2cd25b35815b72ca92beb2b7861de4a1ade SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0
 DIST gcalcli-3.4.0.tar.gz 1675456 BLAKE2B 38ac6eed8e03f806fa2311389c4fc3377ae16ee95af8d42d15eedfa37599d56d56c0b950e1eabb1968e4270657a5af70f789eb9e86d01baea35c9f84b13f6d69 SHA512 d3844dc34dfd21b1cca6f46bf2b66b6aabfccd4d7b23ad4e076966aeec51681792c0dbe5f61e4cb84a75ce3bbf4fd1c63a2ce759cecdeee3e4608c0238c07a4b
 DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 BLAKE2B 8388e489abd21a916568c9a39e1b41875613656ff60fbf6b555bf22408619e940512405c89615eb9477a20c5443e5d7d1c714905df86da4d76d1eede033daf01 SHA512 215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18
-EBUILD gcalcli-3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
-EBUILD gcalcli-3.3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
+DIST gcalcli-4.2.0.tar.gz 1701050 BLAKE2B a0e310097cdb740ac873049d19d21dc8698afe61c919fd082258864e7170f5ca42a55b4eb211cfa9ecd9b2bef63f3e107839a4e3cad9ec2c278a8529f58ac33c SHA512 2dd39a62e3fd81753f30b77be196476ef366cb6914e62c5de82ab946b7159751a5cbf246aa54eaed1fb6adfef7dbba785d10e29571a454b627b7ff45b52375d6
+EBUILD gcalcli-3.2.ebuild 776 BLAKE2B 66a036db0eaeb4e55f3a93b7941463a75f1c24fe75d90c33d5423ece1767b13714dec29df67e13e80555948b6e2038dc9962427c2ae0ccb025692f36f1527b19 SHA512 19f7bf0cb7e52d70c12b0f97ce45a5846b1ebf166210ec2bea7f97ccaf730727aa6d74ae8c244fe406081e3ee9129c52ba070e91aeaccc54544a798b1d1b76d4
+EBUILD gcalcli-3.3.2.ebuild 776 BLAKE2B 66a036db0eaeb4e55f3a93b7941463a75f1c24fe75d90c33d5423ece1767b13714dec29df67e13e80555948b6e2038dc9962427c2ae0ccb025692f36f1527b19 SHA512 19f7bf0cb7e52d70c12b0f97ce45a5846b1ebf166210ec2bea7f97ccaf730727aa6d74ae8c244fe406081e3ee9129c52ba070e91aeaccc54544a798b1d1b76d4
 EBUILD gcalcli-3.4.0.ebuild 957 BLAKE2B e711b0dfcf53ea457cd43946e2808ace36afb7806f8eae00ca556450f6ba3542ed6c7ccbaf0b1ab3626d49605dcbf36bb36a8fde44e80774a35a1d357e82d052 SHA512 105df2dfa0d1962616c650d05c901b2b8d6f63d2b799eb5f1a08fb062f7555e5c0f67b150cba95a2cfbc473fbe7b0b182054165a94a5042e1cc74275c45298b2
-EBUILD gcalcli-4.0.0_alpha3-r1.ebuild 993 BLAKE2B b1fac1d55ca70ae50d96943ceec2ccbb181fcb75e614a2a1f415f78f4bf602f3caf34427b5fa38f0b53cceae60595a8b2fb04aa9f51e639d1563941b5e9abd14 SHA512 cf6d503c7879b0b434aaed44743ee99be5af8f48009f92c5a44677fcf8add533307c93741eacca5687220a2295f8547834f59741e4aaebb319fcb5a521c8523f
-EBUILD gcalcli-4.0.0_alpha3.ebuild 872 BLAKE2B 82a8e8d765daff00c0b05adf161acecd6584a43918721c9048fb7f6c54a49bee8c8b2f34b46a7296b7d6640a65e26e78c4e45085b3bd9c774c932acb381b5b7b SHA512 7b46807216c42f4129908bc96f71d365f97dfe06e1b95a3124b2812943e6c55423b25cd2543e3ebdbcb67b9c2c6f8ee0a9d8f446c8fb226adddd1ee0ac50c2de
+EBUILD gcalcli-4.0.0_alpha3-r1.ebuild 954 BLAKE2B 7f8206a50d8b9ae9c50bbfa3e1c37ee31a7ada55152dba63ddf6b9c71b0c0a0a8caa4a5a86e1b0ab889b8a49f1fb829b30d8de5ae3909b758325ae12dae3e692 SHA512 ebd57c2c8dfe97ad3c7aae89f02a937af3a8687924ef501e93a96b7e53dd522c40757bc3a4f6523bfe6cd565b4d413fd3329b5fc942da4bc3fe4545a78690d95
+EBUILD gcalcli-4.0.0_alpha3.ebuild 833 BLAKE2B 8fee7b0b163d971e92cd7fdbc80af71f7b325f38eb2c537fb4be7592c54ff8af795c43923a85e13314f885c7698ca834d7887548a1f639de405f8a954e38f457 SHA512 0df6f83de590dd2c573b553fc3a01f91c491960585576612f157113c101285fb63b748844e189ef402e5b95e36b4bc1e032a603988ff026eca4c1de6973eea0c
+EBUILD gcalcli-4.2.0.ebuild 896 BLAKE2B 5521f59654158920e3ce1d917e14f78b4f7d0887a3e943c26a1be2bce014fed7418338122434ea32d46b20baa8ae06f5b89eff0f8acaa30f129b827a980306d5 SHA512 92ff03bc0cb966c2dc7ba59353ca0e8576480cb8f0e8589508e370c53f59816d7e5506fe14baca41d3851e1e8f785cee1c869762fbf06c8797904cd41af89a30
 MISC metadata.xml 340 BLAKE2B 206e5c230d6379249a0cd6e99bc41cd3246cd37dd3766be939b5fea135664b63e9cf1aa92e24f035be65f0553f7f7cfbc8a460391f52119aa1f052399c05ea33 SHA512 4d2abd6d07db32d501923eef6b9aa7752b844745a0511a36801480833dd205adef443bea80efa86d270cdd6d0edda16a9989d678221d0b480366a47a7c76de02
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild b/app-misc/gcalcli/gcalcli-3.2.ebuild
index 5278106779aa..3460c4917c67 100644
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
index 5278106779aa..3460c4917c67 100644
--- a/app-misc/gcalcli/gcalcli-3.3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
index ee26100ef277..70df094b061b 100644
--- a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-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
@@ -21,7 +21,6 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/gdata[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
 	dev-python/parsedatetime[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
index c4ebdd93fa56..f2d5ab94edcd 100644
--- a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.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
@@ -22,7 +22,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/google-api-python-client[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/app-misc/gcalcli/gcalcli-4.2.0.ebuild b/app-misc/gcalcli/gcalcli-4.2.0.ebuild
new file mode 100644
index 000000000000..ede92a3b662b
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-4.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# parsedatetime doesn't support pypy
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PV="4.2.0"
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+	dev-python/parsedatetime[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-gflags[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/gcalcli-${MY_PV}"
+
+src_install() {
+	dodoc -r ChangeLog README.md docs
+	distutils-r1_src_install
+}
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index a1bd6a5a960d..4513ffcf57b5 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,3 +1,3 @@
 DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
 EBUILD glcdprocdriver-0.1.2.ebuild 777 BLAKE2B 3f91821217a37f85a059abebdb9549e882cad5421a0803b810ef34d065d528593c3105f99e3e3102345b301855ff50195f13c3e064d4cd3177058f92672e3f5f SHA512 4ea8fed15eff664e6c7670d964d3a51d782ffa3b7a04dae333df7255d7ac80662cfcf858a512c2e0c5f0854d2409db18b26601432635e6f6560c66517239c0ea
-MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
+MISC metadata.xml 970 BLAKE2B edf28da95755519bae2bbcee96594236fb037637385fefe95dca2336bb7e2a09a2ac73b677bfd3579a4f8e4712e91b6b923ce59d3a69f81166196d19cdb88bf5 SHA512 ee80e848d6c5f8ee85758e90b45501e283521d0816de670df080bf97ea4b90526bee9632b28546ff3a20998f507b648b721f5157958fb18833df91709cc4cb84
diff --git a/app-misc/glcdprocdriver/metadata.xml b/app-misc/glcdprocdriver/metadata.xml
index 85a394977caf..c6775fb1ab3e 100644
--- a/app-misc/glcdprocdriver/metadata.xml
+++ b/app-misc/glcdprocdriver/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		GLCDprocDriver is the glue between the graphlcd-base library from the GraphLCD project,
 		which is written in C++, and LCDproc's meta-driver "glcdlib", which extends supported
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 2dffc56d5272..456930b66afe 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,5 +1,7 @@
 AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
 AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
 DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
+DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
 EBUILD golly-3.2.ebuild 1148 BLAKE2B a753b5b303d6d59ea2cb9f596367c473896328947b64214cecb53d59082292c9f38e553127142b25ca6e0f52ab379f25a52ccd95d54c258ccdbe6a831877f4ac SHA512 5192b0c80ea964422fb49e607af8e0ac68a8dced02182a38cea1c0fea5583a07784ff8ffc6f47f56c5b9f41d217717e9dab776920c1872b0b137f8c3fb07bc43
+EBUILD golly-3.3.ebuild 1070 BLAKE2B f1d227c74b7a0b2974643d6ac296dcd7a435072aa4f0d2b632f4caa3143a0bb889dc4a1c94461536e7f518de6246a513f27ccb1db79405bbfbb2a5ae1bcb4ec2 SHA512 32dc8bc6e44b73198fc92110610438d4e4988bf11567e5d5396fa8126111746d9ca7e08a7c58ff54916b83b1592cd451644fae4c8f9bfb100c89908373ddc16a
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
new file mode 100644
index 000000000000..f3319b32e24b
--- /dev/null
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 660d408758ce..9d9d80202e82 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,5 +1,3 @@
-DIST goobook-1.9.tar.gz 29274 BLAKE2B 1c2b0b04a7bd21135395d9c3965095973d6a67a9ecb1a6bbe948864eb8bd0e4ed86197de6f5545ce112cc8538abb5ab9fb773b72b569bc9f16c67dcbcd432d5e SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81
 DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d
-EBUILD goobook-1.9.ebuild 1283 BLAKE2B 3c2d2f5e9abd108e7b862277a2ad4e7a1210b54020bedaaf2852c0676ab5bfc0a780b178b9834bfde07a3f06962c88407d622f92ba1320846519d22a9a0ce077 SHA512 6e2b832fa37515cf0261aa6470d3574030bfb77c3b31341727bdaea88dab105d282209d7b9715af4fe4b6cad81666f403f899ac144ba70b203a323753f1680f1
 EBUILD goobook-3.4.ebuild 1099 BLAKE2B 5d52a7b5482b52e988aad28298a045d12d5a540eb92465e1453a41672ebd2a0edf511ba33508796d5b0bc70ae7f25d72a50a08133454688bd5f883fc864d0a48 SHA512 984e4f409f4f2c0135e2dca5c2c82b1c89487c8d81c36e613a69927c8fac10f5a2db61eb40fedcddab5477987af65458dbb2a43289cc65814390a312b99ba0c5
 MISC metadata.xml 453 BLAKE2B 000e304e5d8f67c8f2b272b75a3f501e5b73366e8ac75f9a1a8f5f7b4c67ef75e8a8f540f3f30b73ea85d9bf290f0676697094ecf55dc11180d84200194614af SHA512 910714efd3b83f29a6b95b5ac13a7c832ae336a6c5bc7505d6ed44a8342ad31b5b2545c63ec25be525a0cf54efb62283d576cfb11947018f75490453a0823045
diff --git a/app-misc/goobook/goobook-1.9.ebuild b/app-misc/goobook/goobook-1.9.ebuild
deleted file mode 100644
index 4542ff94344e..000000000000
--- a/app-misc/goobook/goobook-1.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Google Contacts wrapper for mutt"
-HOMEPAGE="https://gitlab.com/goobook/goobook"
-SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/gdata-2.0.7[${PYTHON_USEDEP}]
-	>=dev-python/hcs-utils-1.3[${PYTHON_USEDEP}]
-	>=dev-python/keyring-0.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.4.11[${PYTHON_USEDEP}]"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-FORCE_PRINT_ELOG=1 # remove in the next bump
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-To setup initial authentication, execute:
-
-~ $ goobook authenticate
-
-If you want to use goobook from mutt, add this in your .muttrc file:
-	set query_command=\"goobook query '%s'\"
-to query address book.
-
-You may find more information and advanced configuration tips at
-https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index a97d768b7cbe..400165e993e1 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,3 @@
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 EBUILD graphlcd-base-1.0.2.ebuild 2164 BLAKE2B 6b4ae541c0947ff0d77864c57a7be8c2359c991b051451f8a79600c8c1f95547a84d0c90b1bf14984d779b0abd062c2e4f8dc790a4f54aedc650b6101acf1211 SHA512 c38c31b8c6a6e9653273b7803e3bd5ba393893d45d7b152052dceb38c90f7273ec82728d5c47343e6fdbfe68f540a635bed4c466021c00275289b9072be90287
-MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
+MISC metadata.xml 958 BLAKE2B d705544ee3477a7a1578ebe0fd4c96b2efa4fdc41e98eb6b53a7c48194ad054a3bc1abd77237fe279d062fbc1088e22d63bf898e2d3948d3b535cae502694b79 SHA512 774f0ea0197291a2a114d126121b5db76374893dcc5873af1eece93f482bd0db12f4964b151bc142a2c4f986a9e5e19079a47feb3440fc40d94cb930f074a82c
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index f095e3e18617..73cb3bb594cd 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>gentoo-vdr-project</name>
 	</maintainer>
diff --git a/app-misc/hatools/Manifest b/app-misc/hatools/Manifest
index b80e65c4aaba..841a5621becd 100644
--- a/app-misc/hatools/Manifest
+++ b/app-misc/hatools/Manifest
@@ -1,3 +1,3 @@
 DIST hatools-2.14.tar.gz 156771 BLAKE2B f8838054be4a9f4d197a494b5e27b16833ed2b902c2eaabb1bad1c5dc1bc8b1fbd99fbfb6ec3276934b61256f918f5936b8843d6ddab5920f8436b078736709f SHA512 359b652696b6f56287e336df0a844e3d4df098ee896bb5857e9fec087ccb122a5a94aac01ae4c87e530716dfa373814ec78b415dd76f65d5e60a8274af70755c
-EBUILD hatools-2.14.ebuild 488 BLAKE2B d2c150190d1d7990cc2a0a296ac4e8ce669cf111fad603ffe72d8dba1c91242efeeb72262fac4b6e75dce6f10d762c04aa4162cce1e9881707856c7bd68582f0 SHA512 f67cdd263527f2823a0f99ff7bbfbb0936b30a4714c582d4802b313ff731bc3a2ef0b4980324c84aa23c44f3d343a37d21c7c55885d58edbae8d3c121ad880da
+EBUILD hatools-2.14.ebuild 512 BLAKE2B fb8de19b677c3d2fbe7b695cf3b437e185a9cfd2d0013a3225f383611a8fb4268532570b6a3619d100edd2de82abdcbb4f02e07904a33fb209da9dad86fb2e24 SHA512 b6a4591d7862ea04820585f53e07e20e0c950654a7504724486b7264b6286f0f17e740cdc8e46ddafe5e550d00cc767407dc27a00053004d39cfe5b694dfbe02
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/hatools/hatools-2.14.ebuild b/app-misc/hatools/hatools-2.14.ebuild
index 4f02f52b8445..b689dd64d162 100644
--- a/app-misc/hatools/hatools-2.14.ebuild
+++ b/app-misc/hatools/hatools-2.14.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
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	sed 's:ksh:bash:g' -i test.sh || die
diff --git a/app-misc/hddled/Manifest b/app-misc/hddled/Manifest
index 88d420b2032e..aa853a189c27 100644
--- a/app-misc/hddled/Manifest
+++ b/app-misc/hddled/Manifest
@@ -1,3 +1,3 @@
 DIST hddled-0.3.c.xz 3108 BLAKE2B eb7f2ab61d1969fe0f6ee3a8bebd7346b5cabcbb8a432a9c8c802289dc022efab09e2ca627915c9d2aacaeac8e6519524b9d77d34141850de7693778e825fba8 SHA512 9f535557aff78d3c9693a8d34810a768e8306de73841ba0d0a928a5d205a8a5faf632a9bf51db8763b5d8d2b3de73ee6f06af62f1a0025b0912c7c18133cdf19
-EBUILD hddled-0.3.ebuild 783 BLAKE2B c54c9cea89f996e1b7fc627b3583a985d85451ee485f5fd91ba97bbb3c7546c58f02824326499ce948f28a2c2f74941f5fe9448cdead973ba26ceda3af83018d SHA512 cce593ff9cb8517bd3c3ddec35a5bf195f256eb6965bce307c7843d49a2cc92a3a17581cdcf6184704f2092f84bd42bb1ffe662b55103ba6a7f4a41f15efa6fc
+EBUILD hddled-0.3.ebuild 769 BLAKE2B 2b974309f60b7e4d288ffe8b6d6daaba58536dfa49dff4a53824b84920b66776818cd6a19227401ed4cde8899c3cbaa9aefd7902c5d18da46a0096a3a8ddd2ef SHA512 6126294072c6f224c8a44cf6c1218c22937a433155d116e81ab028565eb758d39b60f4a20e2c0dc8fc4c95ede2dbc56916009b98fda841156d4dbb24e8c9ec49
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild
index 7197a4970c71..97557da00d47 100644
--- a/app-misc/hddled/hddled-0.3.ebuild
+++ b/app-misc/hddled/hddled-0.3.ebuild
@@ -32,9 +32,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	if use X ; then
-		dobin x${PN} || die
+		dobin x${PN}
 		elog "X version was renamed to x${PN}"
 	fi
 }
diff --git a/app-misc/ifp-line/Manifest b/app-misc/ifp-line/Manifest
index 27009e440a7e..c8723a2f8599 100644
--- a/app-misc/ifp-line/Manifest
+++ b/app-misc/ifp-line/Manifest
@@ -1,4 +1,4 @@
 AUX ifp-line-0.3-fix-warnings.patch 1080 BLAKE2B 72e77b8d09dd077d399275ab5f46365be07278208281629416ccff43667c86d709b814c32163161c0e1e5bd4b5bf3dce76306b34a98e874ccb850065a3b83d3c SHA512 348fea237990df0531c32f688f888af2f247a318c711582d5a113531f1e28380c5b62d79947751c7f1180360459a883cd1e505f8e9ac04869fa68392d3a2b400
 DIST ifp-line-0.3.tar.gz 138272 BLAKE2B 249476938d111cc7609069f448b248921211cf298415951f4ea5043a8eff0eb80d11aeb1dab3d5d9db1aeed82b0de205d79945d4b0379762b62bc979485eb95e SHA512 516ad85fdaf69111581b013b2517c7083656436d429a86ec5ca4b7dcaf1c841538f98138cce8839d990a34550f11cc6bc9dedc701b0123b9cb73a91a7d78694d
-EBUILD ifp-line-0.3.ebuild 777 BLAKE2B dfec032550f13547f349b5c23fe570654e4fd04c7352c834eebe87324414dbafb8b1dd64d460cd24500ee329b708f6e65250120ca3b7556845b95cd575f14654 SHA512 f8359d1073a39edb527ded74cde0819675769c07d62a8da2505da31495cb338bb39bc15205d371d5cfec11787e7c1335cb8277ad6f40078409600e19a9080e0c
+EBUILD ifp-line-0.3.ebuild 763 BLAKE2B e9ca62915884c2577e13cee495df691203a5a04bb1d5b733483fbce5f538c4309dbacfcd570e0f0390f48adfabfff6531937d704b65488e0fbe8c9dc475d228b SHA512 55bbf8a50397f3baf870e5a7b93e7ff73cd03c67479f9230e3831b17cdae60eafbce6e60d3c1dc9aaf9b0b71c0c50d9cf0be5b14536157d53207342c9e6390cd
 MISC metadata.xml 333 BLAKE2B 87a4530824fff1355c5d2af1b6483b6fb1752c5a346b5848500b7962307a2e9956727f08e753b1548fbd941352a4563e9c14ae386bd46f238f8929cc2d46970b SHA512 d0cd8f6fc7bdc757d2a1ef5443f30410514ac335bcd2a84829995c527862b994fc75a8dfc5ceff2b8e2a3d7b0b081a57cbc50e4b825567b8a56d0f9eb00c13c7
diff --git a/app-misc/ifp-line/ifp-line-0.3.ebuild b/app-misc/ifp-line/ifp-line-0.3.ebuild
index ca5f7b8af6aa..c77ec2937f0f 100644
--- a/app-misc/ifp-line/ifp-line-0.3.ebuild
+++ b/app-misc/ifp-line/ifp-line-0.3.ebuild
@@ -18,11 +18,11 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" )
 
 src_install() {
-	dobin ifp || die
+	dobin ifp
 	doman ifp.1
 
 	exeinto /usr/share/${PN}
-	doexe nonroot.sh || die
+	doexe nonroot.sh
 	default
 }
 
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 0c1d19a58440..6bf17597c5f8 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -7,5 +7,5 @@ AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a
 DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
-EBUILD jq-1.6-r3.ebuild 1824 BLAKE2B f01f0a1a5bdf34fb06dbf37c27864f742567c1f0582147d190b071b2e03c8bd597775c0604d303c79342df04c9cd26885201cc61605d99122d0aa2db1c55cc5b SHA512 d5b5306afd0ef588bc69e573682f60654e29a08066a919c1e78789b8d471d560c6b79bd972e0d82620b30bf4682657ca4f96ff2f8043c2c35221e40ac3daff28
-MISC metadata.xml 401 BLAKE2B 5cc250a802d3d94afd6b8d41d8a93a774195064698ba2b1fce5a82f460714d9e0df72c320ecc9773fc6dafecb3a86cef88ea05a68e6b243c3f49afcb90c20ff6 SHA512 10491a550502e80ce57d4ba723991f532955943f8703b6b4580868907b6e27c7f5faf7d1d9c53c03cfa4f6d57233e001a8b9a41d1a132cc4edd1fc5ebce6c526
+EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
+MISC metadata.xml 595 BLAKE2B cf785d8ceab62aa62f65f3f9eadf20fddab1e15f4461960e66a3b8c4fb747d6748a94576f2300ac7bef4220a635a51d90dc85d8c8eedfa097eef76c1dd9456be SHA512 ff760e992f881a3f7b252cbc59d7a97dbff503100d6ab72d2f0e5beae7ae5431bbc69fd58e3db12bb9c353826613e2c671790e04203a607a7029ca67003a42f6
diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
index 5517556e8d5d..f1172ab62ab9 100644
--- a/app-misc/jq/jq-1.6-r3.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
@@ -60,6 +60,16 @@ src_configure() {
 	econf "${econfargs[@]}"
 }
 
+src_test() {
+	if ! emake check; then
+		if [[ -r test-suite.log ]]; then
+			eerror "Tests failed, outputting testsuite log"
+			cat test-suite.log
+		fi
+		die "Tests failed"
+	fi
+}
+
 src_install() {
 	local DOCS=( AUTHORS README.md )
 	default
diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
index c6f63694b155..65a87c9344f0 100644
--- a/app-misc/jq/metadata.xml
+++ b/app-misc/jq/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>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<use>
 		<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
 	</use>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 8468175965d9..5f0666362aa2 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -4,7 +4,7 @@ DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf8076023
 DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e166aa9fe00d44295031d336651bbb74e2ab73a6ae85275f02f8bf035b6798e280055dd6e38dd139f30c6c8 SHA512 4c47bd18e7458ca7a6adf0684872923b4e49e6bfe481269cf9f77dee29dd47dbacf0d557890080618b4d3f08766fc8fae32de7682167642f0705e5b3b6b5dc01
 DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
 EBUILD khal-0.10.1-r1.ebuild 1268 BLAKE2B 8ada46a8439f190bdc9ebc713423b409bcf646c12ac37d59ae2696d1a9e18209f79112b179bde6e3a4c6583a8b002855e4a94a8492d95790d7426cc205f1ffa4 SHA512 f5f4d34a73e4af6d5ff4568a3aacaddb44911001447457d0ccc1c778725348ce200e5c94e70cc43936831e5f35ce53beeb3a7d579e39c4040dc721457228b7ce
-EBUILD khal-0.9.10.ebuild 1208 BLAKE2B 63d1490b3b59a7af0413049b44257cc2f0f57cff203e086d7b65bc29dc34c6f87eed34c09bfd89cff0afb767601b52d5384efb8c22849c4430a841d1154aac77 SHA512 44def2a12f2303881b7ed28ee189a48bfc75078f0125151e8dc7848cce9979c75a51d0a378022c9564da8e8b5403f34da346018a4485827b9b6c91c10ef0b1c5
+EBUILD khal-0.9.10.ebuild 1215 BLAKE2B 45129acfaffe138bb161efebdb6a4d0011c1d90136cdea3f40228a59c0dcc19a4ead18dfb1787e3d7c0f48d7bae88b6dc343f33d1667405fb8dd3e03435717c1 SHA512 aacedbbbcd009955632d22a9da1df24b5f274d6ac7ec8414a00e46eca34e24cef00b33322309c1a440970c15f47e2bd36a2602af8a18e3c202d52668e07b9888
 EBUILD khal-0.9.7.ebuild 1202 BLAKE2B 158a5effcf53a3d2e1e3945bc6058cba8839f9a2fd33ccfcb7c1b3c2be8b6d29398eb709e987b6a8912810d6ff6c5651e8f39070aff43022f0f0b415a95a4d11 SHA512 a1eb0c2282e0174bc865208bfe599c276941fa3365ce49d9b42aba1277d97ac8bba78fece9a42f6699f1a2fd36da83994bd1e806c483948600a705642a25134b
 EBUILD khal-0.9.8.ebuild 1201 BLAKE2B f507299f754add04f5e84ca4c59b770ef1d637556d35a028181c74f90748586256d23e2bc858b6f1bf8a441b01ae4b1b3b56a59e1ae43e8667055cd461ba7085 SHA512 9c0675ad1426f3bac09f1665b0a21dcac8b3cd58ad0ee1b181d27fba62568473aac56cdeb071348eff1230761f9c1152d3a559eb36b7aa34d571885fbc99ba11
 EBUILD khal-0.9.9-r1.ebuild 1218 BLAKE2B a79d94f2a613744188d6587ee3673810d0e3d6a3a8c5b273680c2e00f3e76b4d391c5adfdf680a7f3daedcf7a5c3a879207658e0f065926af7a6efd4a02431fa SHA512 844f8813a758e877b300c1b541fec272c03e8d9ee72780cb367f1d44f46a7f983f1b51ab62f15112f01e7a3e336cc2f04ebe52a642f496617544c2ba85143dc4
diff --git a/app-misc/khal/khal-0.9.10.ebuild b/app-misc/khal/khal-0.9.10.ebuild
index b96dbd1db0f8..bb45d7fa8246 100644
--- a/app-misc/khal/khal-0.9.10.ebuild
+++ b/app-misc/khal/khal-0.9.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://lostpackets.de/khal/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 3fe4da499acf..dad89174d447 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -3,5 +3,5 @@ DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4a
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
 EBUILD khard-0.11.4.ebuild 1051 BLAKE2B 35281ee5be57a11f14c39972cd62d8905255fa7f3b80db159728f91f14f2f2b53fd2d8f2bdcedf95f75e54fe64cfd6bf56a53cbba7f60f615afcfcd3128286ff SHA512 fe89ba5e91eba423ad2c043032147d92bdefcb01e4ba4cd3d4ef6f5f246ecc070a9fea0a585759024f225e9cc42e61313fe246718deada83651c7b18bf439f7d
 EBUILD khard-0.12.2.ebuild 1092 BLAKE2B e9c01439843b829c52d2b88048064a066b0aa6755f1e566a37d15d7e709bf60697686529b23eb7f1778bb9288f8e58ad588cdab3cb4cf65480075c0906a41cce SHA512 21ad1929357ea9077e6946d757564d0fedc84d81781ed0251e1e940efb65121de27be5d14f140242fa910392158882cb397f3da8bb6a75c6128f96f3be80e771
-EBUILD khard-0.13.0.ebuild 1160 BLAKE2B 3f35e34b09e0fcb3945772c0db37acfbc3654554ce01b51455ae9dfa4aa652d9b28c67517735e9dbc338c38a7ab9791a1f986860ce8818c7b776e92f88856d7c SHA512 b9a90448f96291407f21765c6c2bc04feef3533227d06b9ffb383597eec7024347aed9e18b7fd33acf1e970c44f720154b2a2cf8dc202d916934ba04ba616d9c
+EBUILD khard-0.13.0.ebuild 1187 BLAKE2B a9c472360bfd317831ff628de145fd76dc3601d5df83890b60db3a6552995367778a4f2770f873d409be06b7e7445d9226ed0cf92704dfb016a6c90b03eeb632 SHA512 ab66470a74738dfaaeb41677f44223951df9855647a004355b34000cfd9b222cb98ae55bbd061583e9d38b2486285b029a1ec6af8e2a4b1fb9e2b9586ee77aad
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index aaa0b86fb01c..43c01300c2a6 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -9,6 +9,7 @@ HOMEPAGE="https://github.com/scheibler/khard"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test zsh-completion"
+RESTRICT="!test? ( test )"
 
 if [ "${PV}" == "9999" ]; then
 	inherit git-r3
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index 50dd96d11b6c..c101ca1db09f 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,4 +1,4 @@
 DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
 EBUILD kryoflux-dtc-2.6.ebuild 2411 BLAKE2B 08707c2e94ee349226b8e1fbc6c7ce4d63c73a3f12a74fb9c5da26d6af4c1c8ae3c2d88e5c71291b9a2e4ebc293760d6c4b8f650000975f5af2957fa3d480bdb SHA512 b8f561d7da48a9b80235b47c8fb04a7eb7bac506a4b7fe6ab89559ce40b8283f78121a5749fe9a3466ff11a905a8672dea8f6749874e542bdb0fb73b0e91c91e
-MISC metadata.xml 582 BLAKE2B 6efbcc8d9b65499ea7025dcf9bbf1352a52abbe34a77d8ac59a8f022448ea82d12d84516104b7a719d4e9014a51460bcae29efce62a9a5e6bb41332286528dc1 SHA512 00f628fd32ab3a5568f9bbc841c38732b07d9db58ed2020703dfb0908aeaec2b07d8a6aa84e884442981126755c7d6f92cbef7238c38f2c3d6fc985a3721e9e7
+MISC metadata.xml 463 BLAKE2B 1727b8f72aa4075b61c62074b099c9f2f5f8f6976aa7ea2332ea1e62842d59c4d80d08d71d88b6e07c1953d7d4c9add15059f5c48c74d2b2cb53cf590a456a97 SHA512 39dd836502f9ada368271cdd780327679622b599d2a29ce1236926df50453a7926a7745e754d9ea77e906da7c6a7f6e759aead1f25e09738db1f53311018ff2e
diff --git a/app-misc/kryoflux-dtc/metadata.xml b/app-misc/kryoflux-dtc/metadata.xml
index c95657a7f862..f275c2365baf 100644
--- a/app-misc/kryoflux-dtc/metadata.xml
+++ b/app-misc/kryoflux-dtc/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="demos">Install example floppy game files.</flag>
 		<flag name="fast-firmware">Install fast firmware instead of slow firmware.</flag>
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index d7b3d0b11a2c..07c6f51014bb 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,6 +1,5 @@
 AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.11.0_pre20170527-r4.ebuild 5556 BLAKE2B 2bcdeb599002b65209d713bcc6185236d89e40351f490854048ece83ec2c376573029061034f2009d582610bedd5624878152882c69f255f0e586e2e645f5ae0 SHA512 e7c0dbb00a1dd79bf4682e63c9f3fa4508b9967cf9a1cc2a27c7f245304fef06787d1b9886c5eb509966d330b6621313a2f3e25f1dfa1d5875964e65d56970c8
-EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5550 BLAKE2B d9488943d12768363e4fe26511e203856de5a7aa61d79c5668f3b39a7bd72b0b07486b90d2e15c277de8ef04a1b828ff6e77cfe6b8eee14a5a7af5c735ceb3cc SHA512 63191fa94067bf27955c830e24fe13c49b9217ef9eedbbd62fc1f0399c7242062696d076dbaff98fb9a0b33fab297fc94069ebae6610c0ad39467980d75f350c
-MISC metadata.xml 3927 BLAKE2B 23ddc24be9b634b9372b6c16ba9f897b3e871f62e495451d8df16fa4559b73e687702012c18c7d14aa0dbd9bc1fb273e361fe0fdf67a91aa5c7039685a181c1e SHA512 ff1905f6e30a0923a1e85a554ea46cedbb1435b29a38f82332890f79bbc561294361687b8a49c164c89d4aae57d8a10daff53e47850dcd30ca3238bea622962d
+EBUILD lcd4linux-0.11.0_pre20170527-r4.ebuild 5561 BLAKE2B 2e2bb11514bd884f02649b6a620a9f4f92097a8d53bc04e1e9b594ea0022ee00de1facd1189c1d93b68edcb9677469c5cb6190fede0ce47eee9ec89ef199204c SHA512 8c2661960d0e099309b0f28f82c301e56accae7a85ef70edbb133fc4ad4c4be71b20b36cecb1f50a8ffcd680e8ff8f55e69ec201fa270dc9b22d08900c15606b
+MISC metadata.xml 3436 BLAKE2B 7c72d72e9be5929fac6f655c2607e5b4140ffb499b4dd3dadfb8a23202c9dedc80650de7593331cb617dfdd04a321679c91e23f7ad187569ab54790eb1dcac49 SHA512 e38a9292bd89f0fa2027b131c60b9faa82c3e12c76caf22d3ec36fe33b51cf3dba3d5e753e2a2587dbc576d5c6a89662806f006d6a665ad1b00f87a6c1b6f29e
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
index 064c6ffca9da..99a2dd057f55 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -9,11 +9,11 @@ inherit autotools flag-o-matic python-single-r1
 
 DESCRIPTION="A small program that grabs information and displays it on an external LCD"
 HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="
 	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
deleted file mode 100644
index c563c89881a3..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
+++ /dev/null
@@ -1,161 +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 autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dmalloc outb"
-REQUIRED_USE="?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
-# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
-# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
-IUSE_LCD_DEVICES=( ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
-	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
-	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
-	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
-	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11 )
-
-# Define the list of valid lcd4linux plugins.
-# Some plugins were removed from this list:
-# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
-# - ppp: It has been replaced by the netdev plugin.
-# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
-# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
-IUSE_LCD4LINUX_PLUGINS=( apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
-	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
-	proc_stat python qnaplog raspi sample statfs uname uptime
-	w1retap wireless )
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE=${LCD_DEVICE,,}
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
-REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="lcd_devices_astusb? ( virtual/libusb:0= )
-	lcd_devices_bwct? ( virtual/libusb:0= )
-	lcd_devices_curses? ( sys-libs/ncurses:0= )
-	lcd_devices_dpf? ( virtual/libusb:0= )
-	lcd_devices_g15? ( virtual/libusb:0= )
-	lcd_devices_glcd2usb? ( virtual/libusb:0= )
-	lcd_devices_irlcd? ( virtual/libusb:0= )
-	lcd_devices_lcd2usb? ( virtual/libusb:0= )
-	lcd_devices_ledmatrix? ( virtual/libusb:0= )
-	lcd_devices_luise? ( dev-libs/luise-bin
-		virtual/libusb:0= )
-	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
-	lcd_devices_mdm166a? ( virtual/libusb:0= )
-	lcd_devices_picolcd? ( virtual/libusb:0= )
-	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
-	lcd_devices_png? ( media-libs/gd[png]
-		media-libs/libpng:0= )
-	lcd_devices_ppm? ( media-libs/gd )
-	lcd_devices_samsungspf? ( virtual/libusb:0= )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_trefon? ( virtual/libusb:0= )
-	lcd_devices_ula200? ( dev-embedded/libftdi:1=
-		virtual/libusb:0= )
-	lcd_devices_usbhub? ( virtual/libusb:0= )
-	lcd_devices_usblcd? ( virtual/libusb:0= )
-	lcd_devices_vnc? ( net-libs/libvncserver )
-	lcd_devices_x11? ( x11-libs/libX11 )"
-
-# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
-DEPEND_LCD4LINUX_PLUGINS="asterisk? ( net-misc/asterisk )
-	dbus? ( sys-apps/dbus )
-	gps? ( dev-libs/nmeap )
-	hddtemp? ( app-admin/hddtemp )
-	iconv? ( virtual/libiconv )
-	mpd? ( media-libs/libmpd )
-	mpris_dbus? ( sys-apps/dbus )
-	mysql? ( || ( dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c ) )
-	python? ( ${PYTHON_DEPS} )
-	wireless? ( || ( net-wireless/iw
-		net-wireless/wireless-tools ) )"
-
-RDEPEND="dmalloc? ( dev-libs/dmalloc )
-	${DEPEND_LCD_DEVICES}
-	${DEPEND_LCD4LINUX_PLUGINS}"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	# Enable all users enabled lcd4linux plugins
-	local myeconfargs_lcd4linux_plugins
-	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
-		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
-		fi
-	done
-
-	local myeconfargs=(
-		--disable-rpath
-		$(use_with dmalloc)
-		$(use_with outb)
-		$(use_with python)
-		$(use_with lcd_devices_x11 x)
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
-		--x-include="/usr/include"
-		--x-libraries="/usr/$(get_libdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install sample config, and must have 600, as lcd4linux checks this.
-	insinto	/etc/lcd4linux
-	insopts -m 0600
-	doins lcd4linux.conf.sample
-
-	newinitd "${FILESDIR}/lcd4linux-r1.initd" lcd4linux
-}
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index b2c00d71165b..669193270cb0 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		LCD4Linux is a small program that grabs information from the kernel
 		and some subsystems and displays it on an external liquid crystal display.
@@ -17,7 +13,6 @@
 		<flag name="apm">Enable the APM plugin.</flag>
 		<flag name="asterisk">Enable the Asterisk plugin.</flag>
 		<flag name="button-exec">Enable the Button plugin, to execute something on keypress.</flag>
-		<flag name="button_exec">Enable the Button plugin, to execute something on keypress.</flag>
 		<flag name="cpuinfo">Enable the cpuinfo plugin.</flag>
 		<flag name="dbus">Enable the dbus plugin.</flag>
 		<flag name="diskstats">Enable the diskstats plugin.</flag>
@@ -31,7 +26,6 @@
 		<flag name="hddtemp">Enable the hddtemp plugin, to read from the hddtemp daemon.</flag>
 		<flag name="huawei">Enable the huawei plugin, to read from a huawei device.</flag>
 		<flag name="i2c-sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
-		<flag name="i2c_sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
 		<flag name="iconv">Enable the iconv plugin, to convert between encodings.</flag>
 		<flag name="isdn">Enable the isdn plugin, to get information about ISDN.</flag>
 		<flag name="kvv">Enable the kvv plugin, to get realtime train schedule from the Karlsruher Verkehrsverbund.</flag>
@@ -39,14 +33,12 @@
 		<flag name="meminfo">Enable the meminfo plugin, to get memory statistics.</flag>
 		<flag name="mpd">Enable the mpd plugin, to read from the Music Player Daemon.</flag>
 		<flag name="mpris-dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
-		<flag name="mpris_dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
 		<flag name="mysql">Enable the mysql plugin, to get mysql database information.</flag>
 		<flag name="netdev">Enable the netdev plugin, to get interface statistics.</flag>
 		<flag name="netinfo">Enable the netinfo plugin, to get more interface statistic.</flag>
 		<flag name="outb">Enable raw i/o access.</flag>
 		<flag name="pop3">Enable the pop3 plugin, to get notified about new mails.</flag>
 		<flag name="proc-stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
-		<flag name="proc_stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
 		<flag name="python">Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.</flag>
 		<flag name="qnaplog">Enable the qnaplog plugin, to read a log from a QNAP device.</flag>
 		<flag name="raspi">Enable the raspi plugin, to read sensor data from a Raspberry Pi.</flag>
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 6cd2fd3f5952..1870b318acc8 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -8,5 +8,5 @@ AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
-EBUILD lcdproc-0.5.9.ebuild 6442 BLAKE2B 929b3a0daf47fd9e1d424d07b411ca2320175c9fff062a6598ab78f26e725108e90cb0bac377fef08abc41cdded81cd318085f707858a2fcc47048396648d847 SHA512 8966dff12755ed82e9584ef47cbe988b97780361133f4817a5b33371fc6a83d624ac92d28bcd1c9d30daa0581196e3592bd967d5e06fc613ac0ec3fa90ded587
-MISC metadata.xml 1657 BLAKE2B 451feff202b2689815732765bb51e50c4e034702b674dd43f37294be9cdfa18f674af05aa067ae12956b41a15bde33c9fd3577fc181cde39b2ca4ae6eb578011 SHA512 fe207c4c26c9eb6140d165b9ddd0826bbdc1ff38f60f1cf97ede90ed601d52c94c4f302b429ab40709cb097e756e09387b7dba8c81eb052b2f8890c6a0006bed
+EBUILD lcdproc-0.5.9.ebuild 6440 BLAKE2B 0561a24a9874580f067afb5d3fd239182c7bcfff6111cba0c4249e6becdefa5ffe79f5be08510220e42419625b0773837c6a9da7635c0e2f8223c55ca26b6a63 SHA512 64afb2ac8bbe5ace6ed869d68ca77f1264a46466ac3b00d320253ab2b172a58ae197c97ca8c07e5792664e5b3c18ced1876f3db2240ef75519915624ebd25a34
+MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
index e2d94ce2cdfa..592f9d1f576d 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
@@ -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 ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index 8b296d83b823..378e5d5fc2dc 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		LCDproc is a piece of open source software that displays real-time system information
 		from your Linux/*BSD box on a LCD. The server supports several serial and USB devices
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index 468d8d2fd7b0..af6e0fb9f3c5 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,3 +1,3 @@
 DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
-EBUILD ledit-2.03.ebuild 737 BLAKE2B 6c481bbfd0bf1f45ec15f83a364d302ba0e4d1193b3a432acf6bd7aede5e7b3bf019ce2a04bcc6b66fa5662dbf72abec595f975d40a19b319e21b8914dc0b36c SHA512 be5a5b2ea702cc30d16d3f254dcc485458bacdbca0405ea94d87f750fa6c7798f93913cf2b5b2814a69d207223e2c7083b3e0a8569568d0305a4bf292d971e07
-MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
+EBUILD ledit-2.03.ebuild 725 BLAKE2B 971ce023a924006eb0ffe4a06709724fe9fa29a5d0dbf7dd6de699bd470009364b13d956a57cf35a281ff997b45cb50f58dd95cc85335b52da10ea079af79497 SHA512 f82312774188f31ef06a5f3a9bb06a7b2ec93b3c89bc21e01d27c796272f1011f713254ea6a3d266521ae521fa0d1cceb6b2e38db8942d75e9d96ce6f9cf175f
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
index ecbb81e13662..0cc52ce565ac 100644
--- a/app-misc/ledit/ledit-2.03.ebuild
+++ b/app-misc/ledit/ledit-2.03.ebuild
@@ -4,22 +4,20 @@
 EAPI=5
 inherit eutils
 
-RESTRICT="installsources"
-IUSE="+ocamlopt"
-
 DESCRIPTION="A line editor to be used with interactive commands"
 SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
 HOMEPAGE="http://pauillac.inria.fr/~ddr/ledit/"
 
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt"
+RESTRICT="installsources !ocamlopt? ( strip )"
+
 DEPEND=">=dev-lang/ocaml-3.09:=[ocamlopt?]
 	dev-ml/camlp5:="
 RDEPEND="${DEPEND}"
 
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="!ocamlopt? ( strip )"
-
 src_compile() {
 	emake -j1 all
 	if use ocamlopt; then
diff --git a/app-misc/ledit/metadata.xml b/app-misc/ledit/metadata.xml
index ffa6c6b4395b..1b2becffa26c 100644
--- a/app-misc/ledit/metadata.xml
+++ b/app-misc/ledit/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/ltunify/Manifest b/app-misc/ltunify/Manifest
index 5b942a7cdaeb..964f22c5a8a6 100644
--- a/app-misc/ltunify/Manifest
+++ b/app-misc/ltunify/Manifest
@@ -1,3 +1,3 @@
 DIST ltunify-0.2.tar.gz 28897 BLAKE2B 5a8b7b86515f41d939b4774afc8c97d7600f6c1c58203a58ec46027138ffc60fc1f0f917c915642ccc5561a311b8d45da39370a71af13b03e51249792d233360 SHA512 e6eaf5c3ef555712219a3edd74d8d8edd3380908cd08dc5168a07111ddb7bf7d0e3d1a5eaf90f6e7ac9faf0474c31827ba0f9f511f170ab8900f0b90f65aa85a
 EBUILD ltunify-0.2-r2.ebuild 633 BLAKE2B 934b4b884b881c8411256d82bf8bdd96cb80de11218f772570d0e122e78d80a208d9151e7281a9859fbc4d521f90140e1994b6ecebdd456edc063dfeebf13f76 SHA512 198ecbe3dbfdb36d0a01c6d13e6bb262b125a60edb4228a20f09dcd4fba5633614002a118a80caec0057d918cc9d86180027f46b23f1875ce8c0964f87583898
-MISC metadata.xml 164 BLAKE2B 3a48600bd6abd341532bf50999cc675af3e6cd0858543438fa9a538694c6182a45cded722d30df9917c6e22341b40e27c01cf2af92b187614e21ab499fab9ebe SHA512 ba52b2f852b918c8df281fb5c0519bc9a0e7adcba14d2684aa4e761ba1c00ac24ffccbe6d56123f63a3ab129c7df43a78ecc79a5885f470cd1d422fc97c30700
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-misc/ltunify/metadata.xml b/app-misc/ltunify/metadata.xml
index 9386b72447d7..cee379b15409 100644
--- a/app-misc/ltunify/metadata.xml
+++ b/app-misc/ltunify/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>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/matew/Manifest b/app-misc/matew/Manifest
deleted file mode 100644
index 2f79b17d577d..000000000000
--- a/app-misc/matew/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST matew-1.9.tar.bz2 29690 BLAKE2B 4bdfca7952ca072d0b2d7749ca9b8a8160db5bb843c600b74439eab1cc38b4302440adfa2e168ba915b27ccd628f693ceca1c4e2976b1ee5346740116a18ea9d SHA512 3d4f37c16567cd93b7a699c4d5f01cd655b57b79aa865aed11cb8aab7afb6cc5dc2cba9aa59f72128efa179e08eb95b1226d068e3ae15aec063bb252d9fa77b9
-EBUILD matew-1.9.ebuild 908 BLAKE2B 43ddbe027b66cb203fcdfbd0a8556d108829d226982dbd10af251fffc2d3c255fac0f34b20a47bf8f024d70212400810ac3ce0c4f93f2c79b784e0b51e27c5f8 SHA512 b2513332933e551d47a8ab214ab27a55601ffe0d0a3ff8c2c8cf31d4bedaa9f351d97a704794ba803a0d7c3cebe875ecee16ed19663465902fa6d738bc71b5a6
-MISC metadata.xml 325 BLAKE2B 98c366a68f5000ec12123f37448baf0f84f2c20ec3724090aaee26029f1bee73090837e446af84e5eec9598749e86a6a9cfb696961fd212f421153f840492908 SHA512 6e9710e9171b11accdf474198ff959c8bf47e8601f156f57885b59a8dd0f81312478ed104111af45578732763127704cfea3dd1ecc51008b26b4c3b8fad46eef
diff --git a/app-misc/matew/matew-1.9.ebuild b/app-misc/matew/matew-1.9.ebuild
deleted file mode 100644
index 7cf650bad544..000000000000
--- a/app-misc/matew/matew-1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Make Album The Easy Way (Matew) is an HTML/CSS generator for static image albums"
-HOMEPAGE="http://inquisb.github.io/matew/"
-SRC_URI="mirror://sourceforge/matew/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick
-	app-shells/bash
-	sys-apps/coreutils
-"
-
-src_install() {
-	dobin "${S}"/src/matew "${S}"/src/matew-cleanup "${S}"/src/matew-wizard
-	insinto /etc/matew/styles
-	doins "${S}"/src/styles/*
-	insinto /etc/matew/languages
-	doins "${S}"/src/languages/*
-	dodoc "${S}"/doc/AUTHOR "${S}"/doc/ChangeLog "${S}"/doc/README \
-		"${S}"/doc/THANKS "${S}"/doc/TODO
-	doman "${S}"/doc/man/matew.1.gz
-}
-
-pkg_postinst() {
-	elog "Matew files installed successfully!"
-	elog "Run matew-wizard and read instructions."
-}
diff --git a/app-misc/matew/metadata.xml b/app-misc/matew/metadata.xml
deleted file mode 100644
index 0e69e0af3dc3..000000000000
--- a/app-misc/matew/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>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">matew</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 137971df238c..e294b5bac38d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,9 +2,11 @@ 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
 AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772684a54744e290f379e86cae4e1669499ba56229359b987d8e59a5673033bb11496898377642a246fc380e83eae5ef9 SHA512 eab959879de062301c6ebd04fbd2addb655a369c5cfc5104226f6cdeac6e55439e5769caf62387898fc6a6971fb7261f1e3090c950db47bc6c74671e65898339
 AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
+AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2687d2f7ec454f11a8e7e39a05677e2ba317bc989b26258f58596da609869b902c596e9f47346cdbf9f003189a2cbe SHA512 32edbd42eeb4de93fc472ed864cf091d55b0a4c5643aa12224f8fa6068c2037a32c348b7b1aafa7bb3bee75ddec8deb571ff16010d9182c19d4c763e9d94b220
 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 2860 BLAKE2B 89f2efd1f31ff3b4c50ff7d4e7c21db6605845cf668fa129e8e9a555d3cf1cbe24dce05b50b13141f310a4d16df5f51211acf8940fc46e31591fbade21eeda05 SHA512 3b458fc317e1a3e26e073ea3effb02c7b525cc9ba1ce19211453bb4b10b48ba94b4aefd0faafba42bb941b24f9e5b6ffefe155e1b8c857f2706ea2745978bd41
 EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
+EBUILD mc-4.8.23-r2.ebuild 3100 BLAKE2B 22a5a111d492041e2d82838d900f191722cbe68c5a9b36ad6f0b518ca265fb537a32f8b1aa3d0cdc8ef405009b9b8ce4bde1a65b12a7e93508bd56a5f0736d21 SHA512 9a868752d33fe61f01aed711d392f067bb7308b26ea3ba94e13783e102b3c59f7ea4ccd856f447a747c5b9fb801bce2c0156275ea2141ba66a0755107a21fe38
 EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
new file mode 100644
index 000000000000..e72d641a5c3b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/700708
+
+From 8411b93ff7cc955b0acf1541207977c52201bbfc Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Wed, 11 Sep 2019 09:17:18 +0300
+Subject: [PATCH] (vfs_stamp_compare): fix NULL dereference.
+
+(vfs_stamp): likewise.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/vfs/gc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/vfs/gc.c
++++ b/lib/vfs/gc.c
+@@ -127,7 +127,7 @@ vfs_stamp_compare (gconstpointer a, gconstpointer b)
+     const struct vfs_stamping *vsa = (const struct vfs_stamping *) a;
+     const struct vfs_stamping *vsb = (const struct vfs_stamping *) b;
+ 
+-    return (vsa->v == vsb->v && vsa->id == vsb->id) ? 0 : 1;
++    return (vsa == NULL || vsb == NULL || (vsa->v == vsb->v && vsa->id == vsb->id)) ? 0 : 1;
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */
+@@ -163,7 +163,7 @@ vfs_stamp (struct vfs_class *v, vfsid id)
+     gboolean ret = FALSE;
+ 
+     stamp = g_slist_find_custom (stamps, &what, vfs_stamp_compare);
+-    if (stamp != NULL)
++    if (stamp != NULL && stamp->data != NULL)
+     {
+         gettimeofday (&(VFS_STAMPING (stamp->data)->time), NULL);
+         ret = TRUE;
+-- 
+2.24.0
+
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
new file mode 100644
index 000000000000..856331ef9aa1
--- /dev/null
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-3933-iso9660-1.patch
+	"${FILESDIR}"/${P}-3933-iso9660-2.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
+	"${FILESDIR}"/${PN}-4.8.23-vfs-gc-SEGV.patch
+)
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	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
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 0b06e348eee1..acd6fd98c2c1 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,5 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170 SHA512 0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
-EBUILD mosquitto-1.6.7.ebuild 2745 BLAKE2B b8ec626d8a25f7666c8f0645835d2eff888899f7446a90e2aae404d94693928f4ad191136360e014f67e5f4542ce847ff70ead4e0696a05109952add1e18337d SHA512 2908088635ea7966f7d02dfbacd77419c1ebca713876c3488766218897bb38f28e870b2cbdeb5ecf144f585b7a5679399f27cf5e3100e4d3a14cdf5dec0277eb
+EBUILD mosquitto-1.6.7.ebuild 2836 BLAKE2B 88fffcd2ad6d45a40f6da80acc6c3b97f7a464d155d92553d32522bc658ccb5ba03b81eb4041659916f96479907ac065f884784676b77b2851b5cf3acc774e7c SHA512 ddfb0b172bb77a87449b924033a6778d768651a2d9132b35ac45f13303c4e04456b0249cf60602d13bd381da13fc01a44f8778a966799e06d1b687fa8935b804
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index 374107d9db97..aa17c9776561 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
 
@@ -21,7 +22,10 @@ RDEPEND="
 	acct-user/mosquitto
 	acct-group/mosquitto
 	srv? ( net-dns/c-ares:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/app-misc/mtail/Manifest b/app-misc/mtail/Manifest
index 6e1b71e84a32..d45bea6c4357 100644
--- a/app-misc/mtail/Manifest
+++ b/app-misc/mtail/Manifest
@@ -2,6 +2,6 @@ AUX mtail-1.1.1-remove-blanks.patch 1850 BLAKE2B dfaffe1b7dbbe54c1db30a7e0ce9c3c
 DIST mtail-1.1.1.tgz 9124 BLAKE2B 804ec168eb5dc5408ffd91fc80a6f080b0575dfb58bc667a3ff3d657cea955a4a697ff3f99470e86e59387e0bb2275cd2a0a6e5ee97bc88f28df4424a4c012b8 SHA512 987816ce5d12996192c881be1ac5a28c3457757e981ab35e657fb226c3980a22091c9fc85f68c13eb1c01939e08e492814b6a03c9b1f4f4bc1878c4f13ec8a0e
 DIST mtail-1.2.0.tgz 10798 BLAKE2B ea822f5430ff67fdc153db5c7d79ecb40f0f9025434eef216e13789ffedf79c00ac3fae1f161805d4ee247f993ab984ffb2e44cb94817e06401ec48820a8272c SHA512 f63686a6b93788ec4e72f5dc59bbd0c5bc5c51cba0812cc894b5bd1af497fd0931f0d5834c0feb5c72a057d3f387e379de6fcd8e3a09c98fc77e5a76ee8da274
 DIST mtailrc-syslog.sample 1785 BLAKE2B d060e9baf750505a0908bb18533aad72675962be98875e9f1fed3c734a0339589122ebe2774cc585b05dfde61d8877e05a42184c966050e245bb57ed2dfe500b SHA512 d6bbaafa7c599f443c788697087ebef69a8e279b0715fa4e5b770531cbd254a646014fa98e5e5d444c48d23974201d36a856b34507a91e1b6abbb423f7015c75
-EBUILD mtail-1.1.1-r3.ebuild 774 BLAKE2B d0db274c93f5d5b29ba4364da797bcbc6c84e4f1e8d9cb383333b4b9690c22c4bdc82464f618f663aceb1a633d03a7df75d01f563fc72ba9b50838b6403c5bd5 SHA512 71ac79bf2bdb32e2a2f3111797c261053fd2a11211376bc7ed554e49bc7b6582a727f240af1565884949aaacf570da623694ecedf68e3ae5e93024e8befd39d0
+EBUILD mtail-1.1.1-r3.ebuild 767 BLAKE2B 03b552b47cb444a6be967586324960c47fcd8b7c81521b5f1b1a3fd50588eb76c0da6e91345e2c559a170408e3f2edcc2113d5e437e903256c8dd17ee57bf4a2 SHA512 b13685f6523357b4c3705934cd2dbe1d97e541d978850a9478c66547d102497bae429be25ff3dfe963c203ae1fdf155eb4f756a7c0c1a0577c6ce04ad293a457
 EBUILD mtail-1.2.0.ebuild 751 BLAKE2B 33f2720d407a7e3d5e4838b9cc5790aff3cccb5d11fee3b4cbd9b4e14fd44cd743b7038dc14c8647162296e55756e4faa4dec6f244801493685e086f90c016b0 SHA512 a1123a941be4071be97b408ac4c4cd11d85d1041fbbc54d81c92bd8c4c34435dc22ffc0651228558acc1675397c77d6acbfcb34eac8b410f386309126fc49917
 MISC metadata.xml 642 BLAKE2B 405817cdcf7d643b775f88848ad91930dcf712d65f5c53582ac41656f7d92095bed83add109070888134c074118c54d7ff79359a20d97d0e1459095923e12185 SHA512 7de4bfd79c4dbd929950e191faf4ff6ab90426a0f604fddbdcbaf65d21d21d9a5ec7fb382dc95751ccda8e463bd189dbc07b4d29d92c9dab90e7eb955ace8e19
diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild
index 1ab1926f586f..74792b6f1948 100644
--- a/app-misc/mtail/mtail-1.1.1-r3.ebuild
+++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild
@@ -26,5 +26,5 @@ src_prepare() {
 
 src_install() {
 	dobin "${PN}"
-	dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample || die
+	dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample
 }
diff --git a/app-misc/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
index 0741e107f32f..ad4c0fb947e1 100644
--- a/app-misc/mx5000tools/Manifest
+++ b/app-misc/mx5000tools/Manifest
@@ -1,4 +1,4 @@
 AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
 DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
 EBUILD mx5000tools-0.1.2-r1.ebuild 805 BLAKE2B 6de00dbf50b046681fb6442888e724125d1894cdaffa9cd31e27ace915100ee017ce5cfc3a63eab6fe4bb0d37629f09395ab2f9a44a0d1b4db88bb2f057f30b1 SHA512 d4fa41ef9faac3ffb62f68493253e458f92aed621641b429eaf316b964ebec0ac0ff86449cb72d1e9ec05a7edd9fb01ba5385818af1573c6ae3f3a3a004759be
-MISC metadata.xml 739 BLAKE2B f242204a9d3f27f2c68cc7771be37cb329cbf57725ddb0ae823191fb62ec23050dc530b20fb22115fd2582a919375404322a8b3192734975d6eb6b187a02c618 SHA512 19a17587727e544f9c3c7dcb5a58693aa294c6e86807a610d484fb568b0a83472abc155609e5fe66e33a07d165ebd1b5968cea18b474ad5a934e99cd7318743f
+MISC metadata.xml 620 BLAKE2B 2a84352b9ee606fe78fd191e2a4d53a859ec850095f0829f9b246ee362db5d4defea7f130b239be42064a09be07f3327df2826eb8546ba6cb86cd310668ed647 SHA512 c025ffc47e55016f56292eabf3e3ae95b5c6a553b60599d1f24c594e155a66e9cc5bc0ca0778837997f37ac2f2c03a05aa38b0020941d1665d2ecc997fbb1076
diff --git a/app-misc/mx5000tools/metadata.xml b/app-misc/mx5000tools/metadata.xml
index eb2ca7b65228..ea27b447f2fe 100644
--- a/app-misc/mx5000tools/metadata.xml
+++ b/app-misc/mx5000tools/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The Logitech Cordless Desktop MX 5000 Laser comes with a keyboard that has a nice LCD.
 		But Logitech did not provide any way to control the LCD on a Free operating system.
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 101a936376e4..a5de05a65205 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -7,6 +7,7 @@ DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d
 DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
 DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
 DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
+DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -16,4 +17,5 @@ EBUILD nnn-2.4.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f
 EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf859db76865d07a485b57a873630dd2808c3f4185b09de196da72cde083b1a55f1992529c8aa158a04158 SHA512 52ab6fb05dc13ea1379cc75319e2fe7ca35554bb9dd0136305ac7dc3eb2c5a446563bdb054a79838601c169e3b3fc0f46b52b965d7ca5e3e82c355e36e59ed02
 EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
+EBUILD nnn-2.8.1.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.8.1.ebuild b/app-misc/nnn/nnn-2.8.1.ebuild
new file mode 100644
index 000000000000..6ca9e1095ee0
--- /dev/null
+++ b/app-misc/nnn/nnn-2.8.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 507133385431..00f8163231ab 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -5,7 +5,7 @@ DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad4
 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-r2.ebuild 1662 BLAKE2B 016fc1f8ce45f304683bb4a56d5d1a5acf7029f4704d46ca5d3cf8c9089be0389cb03f444db45681cbaaab7e70e0b3e5b8076f6ff47ed9d5491b50f8d6fa5519 SHA512 031f740ec81e3e4b6a8b94191c8422bd274a68c3c36f038208cf3253bcfe522c1ba923b44eb0ef9ee4b0ba5837ea5ecb2068109b9b5266fef58789921f5f8fff
 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-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
index 9866e7ac2964..8ef1f755b8e6 100644
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ b/app-misc/oneko/oneko-1.2-r2.ebuild
@@ -43,8 +43,7 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 1b9b532a6b51..55560033907a 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -3,5 +3,5 @@ DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c70
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 EBUILD pax-utils-1.2.3-r3.ebuild 1788 BLAKE2B b76350456cadb9e1814733f34cb0fe49ccb9c32c591cd72f1bda70910d511d8ef649852e248aa071b0fe4c15d0327a7c82ca7806412909e2971f0be2a022d9d6 SHA512 26631d098650f61444109bd4cc11a93d3e34dd484fe45da8980eee24f5d65dea4131b9eb814c521b8472a223c870a969c69d15c36ac028a726a82038cf0b41a5
 EBUILD pax-utils-1.2.3.ebuild 1455 BLAKE2B ab4d234e6513ea35fce6f8c6e57c4f8ff60dacaae4bbe03f5ab1b16a4bac139a7281559691d470285e6c0877b2d3058445fe5af2fb42ead23fc71ac7dbf9ef16 SHA512 d76be941d202b762d7d2adab5129dc95a25a1484d7f412dbde3c3b825ac75304fc3b1f3aa60b33dc0792d34b69e4a6d1ccc81ee9f839b4d77ff93d8a8d9cb258
-EBUILD pax-utils-1.2.4.ebuild 1747 BLAKE2B bc712a624f97c19ba5a8cd71e55532430d359b436d0e0b8a5f995c42dac851dccc32c08f5eb20d9e8497632c011a982ff52eca28eb0c4a60c766acb5b3ef5657 SHA512 a56682c1b730f9416a9ff8626826089231b44b04522fd567e3e2bc31400706899be16b02af40cbef31941615fb22423ddd05175f6dc6992c51d769718d5cc481
+EBUILD pax-utils-1.2.4.ebuild 1738 BLAKE2B a54a79d9d5341aff4e4018a54dd0121b9a64982d5a6474f6681a286580926590a9270d8e095cdaa85ffb89e42549636a01cfb8f7276332658790f0fde06105ae SHA512 5ca94f122ec65a31d4daa356e8b1a569af3f4d77da472425aca29ed828bdf49e2914705147a198aa930d8e67f643fe2c41eadaedb937ba35425074e65853e06a
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
index 9b9c2388356e..a834befc62ed 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
index b78348355c00..4454f8c884e1 100644
--- a/app-misc/pipeworks/Manifest
+++ b/app-misc/pipeworks/Manifest
@@ -1,3 +1,3 @@
 DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
-EBUILD pipeworks-0.4-r1.ebuild 643 BLAKE2B b228b66d2580a41acc8eb1a2c5cdbc27cda4b657458620750539fb0ca3820f56f9f95e4bfb455cd7a1315ed0106b13e2629d8c3b0f49ebe3b95b7ff478390898 SHA512 53c43ffbb4e601eddc4088f21cf089ec30d679686880e3a438579e62297f2ba261c195a4e99019dd68624105390d79624197ac15ec696239931c4bb433c1f17b
+EBUILD pipeworks-0.4-r1.ebuild 599 BLAKE2B 795a28a7265fa849697594948ca9c661172e78d292c34cfe74979aed726b10812580f632deab6dc825040160f41f45640186925577996344931ad7f7a500e857 SHA512 cd69eeb6b4f08dc3a9aeccb6f836fb0297f8f59220f88efaed8d52f2b938fbb1357ea21f9589582d0baa5d230ebc9dc4a85aba05ed5805a068c06a16dac5fbbe
 MISC metadata.xml 520 BLAKE2B 7c3c2102bcdad8698d9970f496002e43a7b93a88368555cf4e6762e0752e1dc56df82b66d4560dccebfa4b1bfb817d2c975019946e269cf074871f184078baa5 SHA512 f95bd764a974893a6ec46c0761a8b7a5edbb467c5b393a771163e42451efb34d75e25b73efb984d960b0aa46f19c233a5fd2df1f90aafebf4365d425d63c7243
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
index c1cb72b55af3..cd98048938b0 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
@@ -18,11 +18,11 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
-	dobin pipeworks || die "dobin failed"
+	dobin pipeworks
 	doman pipeworks.1
 	dodoc Changelog README
 }
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index bd0527ed42a0..85342b79b560 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,8 +1,8 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
 DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
 DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
-DIST prog-express-3.8.3-1.amd64.deb 37858252 BLAKE2B 0edc06e138fb06bf1d09cc8c1e0650fd1e9f3259f8738c8ec2d072914bc1a215eff60f13871b12ea3e650824c2b2e077edc617bd35e41329505343fdc8c18a0c SHA512 e8e7088eb98e4b63e875308c45ee9dbce8cae5d86ce82eff29a2a3ad2798d22f3621fa38ccc7a66f4e6bd3b71c063e1e793453665640e11ffd0848ec243519ad
-DIST prog-express-3.8.3-1.i386.deb 37858512 BLAKE2B e812e44f7d440a7891e30fc3d9230daf034b7aa0eef800388eeccff50ef9a8dd22e5e989e7d8b6f5d07e77fe317d0fd01dd9e21e7f6510adf2e412c09ce7ac77 SHA512 b5805add8c51c6eeda2ba76ebd3a33df753527a60f81ace515e90945b70c5d720dac5d8dd87c0c381b52a690d2501b618e81cde51320759b639ec9bd143c422f
+DIST prog-express-3.8.5-1.amd64.deb 37867724 BLAKE2B a460a4e7aad36c4a2d3054332d8e380a8b8d3639316aceb7c32053b679540e31a8398b609105f8f4169f7a1bcf114c9a793e7e9a46574a6f6bbe005222a368ad SHA512 b9246633d3d213616884f6f87bbbeb30bed9cc14d46428e284de1e47e4e0c9d9be386bca6194b880bc44f53f7b831e51e27b65905f7a75a065880666d0559951
+DIST prog-express-3.8.5-1.i386.deb 37867536 BLAKE2B 067873da13374cfc52e5ef01cd02ee5594415369269898dab6fcc651f23ae0e16f1a44414bc77125e431c1411e7bfc383c45f4b037146b18a8b727c3d8d08a26 SHA512 5be2e5292986768970f6afaa16cbdd1740a610221f2de3cc21dbf751201753a1064d26d0714e482f9c95a310063aec6e2b31a8fa8a020d1d80583c0b84e0115b
 EBUILD prog-express-3.7.8-r1.ebuild 1504 BLAKE2B 49e7d487e736e3029271fa30e750d400f8ee75b81b9e8995d0680f781847ce5b925dd0b348ac51b3db96a207ae6d1bb542e5dbfeaaf02b24695562ef480aa741 SHA512 6389367325a55a79d1ab443abab31d6efd9ab737534f579b5d56ce1a748f14641ba6fe7ff63419dcc41ede98d778847b8bc8658566f9c692a16c4be95e374b72
-EBUILD prog-express-3.8.3.ebuild 1619 BLAKE2B 4d94131b9c5d1e9268e3bef2f921408408593ccf5f89a67e5c62131dace0fa0b3e3e259823c38352eb03f0c11ecb50cc440693515160e7f1d85726096a6593ee SHA512 7fe24c2102f5741ab73f181bbd3c651692a760ee2dc2fab5957371f2287a5226f0af30141d0ed99d4ff6575eac00990188eae3b6f83c0cdf2bcbf01679fe52b3
-MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
+EBUILD prog-express-3.8.5.ebuild 1619 BLAKE2B 4d94131b9c5d1e9268e3bef2f921408408593ccf5f89a67e5c62131dace0fa0b3e3e259823c38352eb03f0c11ecb50cc440693515160e7f1d85726096a6593ee SHA512 7fe24c2102f5741ab73f181bbd3c651692a760ee2dc2fab5957371f2287a5226f0af30141d0ed99d4ff6575eac00990188eae3b6f83c0cdf2bcbf01679fe52b3
+MISC metadata.xml 404 BLAKE2B e39e8e0bf53e344e95e80073ea8f88652831e8be20b801a403c83c401571e7b9ef68707a61354f0b15a7469b80f4da6fe460bec364fab6138fe9cee10cb08125 SHA512 59d4a3766eeaf1d963c48223a5b68a0d999d7aafde06bc7f671d08d6d8c0934516c17bf548560e1aa9f5394003cc54afa79e57c2d6b261aa1d81a3307fc93882
diff --git a/app-misc/prog-express/metadata.xml b/app-misc/prog-express/metadata.xml
index 0a374610972e..e060f42838b5 100644
--- a/app-misc/prog-express/metadata.xml
+++ b/app-misc/prog-express/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Prog-Express is the programming device control software,
 		suitable for all USB programming devices of Batronix.
diff --git a/app-misc/prog-express/prog-express-3.8.3.ebuild b/app-misc/prog-express/prog-express-3.8.5.ebuild
index d9dfb64aae89..d9dfb64aae89 100644
--- a/app-misc/prog-express/prog-express-3.8.3.ebuild
+++ b/app-misc/prog-express/prog-express-3.8.5.ebuild
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 8c19a1685861..0271c2d89c37 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,4 +1,8 @@
 AUX qlcplus-4.11.1-qt-5.11.patch 7589 BLAKE2B 30aeafe90d1013fabe5d2f059ad483a3ddef64edeb691bf7a21b818b946cdbe028d52e4a13e29b0c0c571504dc0cac215e93584bf5a71f6ccfbdd807a16faf3d SHA512 e9b1b160463356a7a9c7768a55435a50a9c7081b342807bdd83282bc500a186f81420402db321463bb2e2ad29db95c3b8b33a7621aa481e34668420c85213636
+DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
+DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
-EBUILD qlcplus-4.11.1.ebuild 1347 BLAKE2B 555ec645507ebf489201fa36bbfefbcc6cf100fc096c7db0d8b958310806c1b98f8621de9793f28a27bcedf68616b896b9da07e290cdbe6390b80faab7507f1c SHA512 84a6cf8545c8b8f2b9c23650fa43aa678e65b7811a6ed7d3359e88bfd19b02807bb1ebced96ea15c41cfcc869c75f0920dd90759278b8917a707a784f1cc758a
-MISC metadata.xml 250 BLAKE2B 53c17a4fb4e05e8f9a5ea7ebb0a760d79c9dbca2bd559e3f3130c3d3bbb738252cc9b365779151066c28380e128f36857024b13b79507bcf9b95d60218c00385 SHA512 9a417c6f3642841781d415d84437664c9adae33bd47c109570dfcb8dc4f09eb1ebac23ff009df8568ba0113d915588598f21fd7911ee8ed5651ebf737db9fbde
+EBUILD qlcplus-4.11.1.ebuild 1379 BLAKE2B 478a6065fde336dbd48725ec7a2c2dec1234dcc967ce8609bff6142c40c33c375a8895efc4583229de103f079bf4e12a5b1670e9fd4e0871ebc3c303cec6cd1c SHA512 4d94cb437c955f2b9531775a1afd63c918b7fc1115a10b0771b43b607de5603945a12ca15d4c326a1ce50c391f33078d09ff1f373e7800f81d79c7497c62859f
+EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
+EBUILD qlcplus-5.0.0_alpha3.ebuild 1509 BLAKE2B 4c3267f85207c1f763ad5c4d7be46df95845e5a30b6769df7dbafe0e9f65b80c4fdb75f3435ea5296934c3b355a79680c6dcdafb90ace5791d5c17b1a6cacfe8 SHA512 06284d1b8f216915031a6974de5070b0a266a1e3cc9ca80399bf377fa8bbb744d593d9427760dc614dccd64253a4d2474aff8cd9ae6b2d587b88a6e2fca30231
+MISC metadata.xml 455 BLAKE2B eb880143c2d81895284171757362efbbf7a7cf53b5e4802d45ee5a6032d6be87ac609c0d4b2e2e0f5a2b7da407ef425ca5e00f2f8d5acce281725fc2e71e988b SHA512 98b45a554c331f71371178ffd02eca17bb6ff4e3477534538223d5478fe49d8594e35c3986c27aaa17f0a413a0ddde4f07cc586ffdbd94842884c428379b9339
diff --git a/app-misc/qlcplus/metadata.xml b/app-misc/qlcplus/metadata.xml
index cba9309e7539..5a480aaabd80 100644
--- a/app-misc/qlcplus/metadata.xml
+++ b/app-misc/qlcplus/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>kripton@kripserver.net</email>
+		<name>Jannis Achstetter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mcallegari/qlcplus</remote-id>
 	</upstream>
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
index 3f618215d189..41463fba3ff4 100644
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
@@ -12,7 +12,9 @@ SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.t
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
diff --git a/app-misc/qlcplus/qlcplus-4.12.2.ebuild b/app-misc/qlcplus/qlcplus-4.12.2.ebuild
new file mode 100644
index 000000000000..9b5db416960b
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.12.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-embedded/libftdi:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	default
+
+	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+		-i variables.pri || die
+
+	## Remove Werror-flag since there are some warnings with gcc-9.x
+	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+		-i variables.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
new file mode 100644
index 000000000000..269ea246700c
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-embedded/libftdi:=
+	dev-libs/glib:2
+	dev-qt/qt3d:5[qml]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets,qml]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	default
+
+	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+		-i variables.pri || die
+
+	## Remove Werror-flag since there are some warnings with gcc-9.x
+	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+		-i variables.pri || die
+}
+
+src_configure() {
+	eqmake5 CONFIG+=qmlui
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	elog "Some configurations of KDE Plasma break the layout of"
+	elog "QLC+ 5's QML UI."
+	elog "As a workaround, try those environment variables:"
+	elog "	export XDG_CURRENT_DESKTOP=GNOME"
+	elog "OR"
+	elog "	export QT_QPA_PLATFORMTHEME=gtk3"
+}
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 2a550f930e93..dc6cd57b95cf 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,4 +1,4 @@
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
-EBUILD ranger-1.9.2.ebuild 1089 BLAKE2B 91eda15a696f8003f2e7fe52fa85d76af8d1637ac5a954554e331cb730868b75bdca707a144bdac237e5236e456a24a92789787e4f1c2e39e4f993dd015d5bd3 SHA512 b64b3bc1808e162698d89721bcfb1a2bf220182a144338ca03b7a13da1ff4a10c44db6fc92bf3810ef282f515c2a5244421721f9976685c1a06e96c12fdc5ab9
-EBUILD ranger-9999.ebuild 1091 BLAKE2B c3adf38cab57b75499778afda6aaa00a8f324cecaa1a6afe4bc8ef58efe1689e9ce0395ee9a586f7315c2f172036ed2c055d4a0cdfea61ec39cdf6d3947d4509 SHA512 6a25719d142ddcf2bbe5acdc05924ff08d635d5b9f7204a23ae21c7cb7d1c58aa4b5f5b9c4c06737921ce12123eeba5d173e5496794e48b4c1526d20504388fb
-MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
+EBUILD ranger-1.9.2.ebuild 947 BLAKE2B 6d50ab935f2eaf291b92e2c8dce55b414cb2a16c20450a624291a2585a1a827712df984a04d7a369c10b121b7194769496760ac8c55c22c23740ece49af7dc2c SHA512 e6bced5e85e26f8adf124a4509d0333b8ec564b6904bbfb28d83792acbd391de4aaf829ccd72fed146375bcd720b7a51480cbda325e66bb632527ab28e0e0485
+EBUILD ranger-9999.ebuild 949 BLAKE2B c9062956afd9663a46f81d765ebf363a58a2485f618d79de0653a65063021dfa862e02cd220c9449c9d009f60e3435029ad581fa2488038eb5476ed5bf78f0da SHA512 b4fbb296526a3cee1285c9ab51966fb9c9566e6fd23d519381112ece7a3512b71a0d6dcd82f03a36e90c0a55fbf23e08a6ac54c56027ffdfb120d2cd5ca8e17f
+MISC metadata.xml 695 BLAKE2B df6caf08621cfa17c9ec7b75c331b329d3bc5b287418faf045c0b721143d802c43f87dba66695dd4352220e939c194efdaddd16f8c6499cbdfae58eb5f11d536 SHA512 01aa726ba045468046c2f4c7d0eb290f82da0c2548fd795e6c7d23ea33a00520deabb62ac677c215c58ccb5d156d007a366515ae8940bd09b3532ca94bbaed26
diff --git a/app-misc/ranger/metadata.xml b/app-misc/ranger/metadata.xml
index fa97c1a4914e..199164de4d74 100644
--- a/app-misc/ranger/metadata.xml
+++ b/app-misc/ranger/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<longdescription lang="en">
 	Ranger is a console file manager that gives you greater flexibility and a
diff --git a/app-misc/ranger/ranger-1.9.2.ebuild b/app-misc/ranger/ranger-1.9.2.ebuild
index 3cbf21455d04..48aa1b9e69ef 100644
--- a/app-misc/ranger/ranger-1.9.2.ebuild
+++ b/app-misc/ranger/ranger-1.9.2.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -19,11 +19,10 @@ DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/pager"
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	# use versioned doc path
@@ -32,10 +31,6 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-python_test() {
-	py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 6d89ea92ccb9..ab9b014fc86d 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -19,11 +19,10 @@ DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/pager"
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	# use versioned doc path
@@ -32,10 +31,6 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-python_test() {
-	py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 2d3028feb209..77af4de6cf8f 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,4 +1,4 @@
-AUX quazip.patch 2401 BLAKE2B c011701e4f416289a5bfc681f2ce3184db091a744192e4b48ae9a42939e862739b030d88caff41a74c4b2ec5ad19e2e0bfa9c3ca0b9dc39f3413cbac41f06714 SHA512 34f2cb3d95ae3ed94adb25964f9009be8f5bab9a93df7ea993797065d297993d1f83a495eef9ee9c3339f8ba6f1e2b6778f8ecd667cf9538d84387373e7322dc
-DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe
-EBUILD rbutil-1.4.0.ebuild 1368 BLAKE2B ea42c5d6fb96eb01e93487f4e05a8747c9395cf033544a51b1b6f37474356af846aeed0b765c6ab0049b2cdf1230e90a10550a6d715545a2400c5f1bb1dbb759 SHA512 90867d25c0140517d1df46bd0fb78670a5a9e430bc935d91a0b475bce706c087749fe47f17ecac8a78807e60541ef4834943c2c4904e771406202568b105dda0
+AUX rbutil-1.4.1-quazip.patch 1733 BLAKE2B 3a8d88de80189199abcf17cd8149cbf702465227c50b686a36a55e701a00f32e242386ca57c8ba96c0ac253fd3bbd1a8c829bb517ed0e9ae47e1815e8983749f SHA512 d36edacd17078fb2b1d31aa1e7096b37ddf69ba51132aa77aa042989302e8c368d53b2ebee9d9018f8c376cf2e5efd7c37361f2d0319d236ac68326d4eed1608
+DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
+EBUILD rbutil-1.4.1.ebuild 1280 BLAKE2B 93cf012a90e7f259b0778efd197409c9db66d652586373861eb239bf642b6a0e0285a6741103186c6c3eb81ea5813159e717e02c7800abb9f54bb3a49d286f05 SHA512 62ae9d21440557666df61f096fc131b99472ad0869403fc0dcbd0a3acf5851200eabf29ca8ba8e07daed36850545e26bb921eee8aab902a2f98dc431b34d985f
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
index 9d803712209e..596127c34060 100644
--- a/app-misc/rbutil/files/quazip.patch
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
@@ -4,8 +4,8 @@ http://gerrit.rockbox.org/1825
 -- Chewi
 
 diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
---- a/base/ziputil.cpp	2014-01-05 22:44:53.000000000 +0000
-+++ b/base/ziputil.cpp	2018-02-25 10:55:36.994002648 +0000
+--- a/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
++++ b/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
 @@ -22,9 +22,9 @@
  #include "progressloggerinterface.h"
  #include "Logger.h"
@@ -20,8 +20,8 @@ diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
  
  ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
 diff -Naur a/base/ziputil.h b/base/ziputil.h
---- a/base/ziputil.h	2014-01-05 22:44:54.000000000 +0000
-+++ b/base/ziputil.h	2018-02-25 10:55:28.513838004 +0000
+--- a/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
++++ b/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
 @@ -21,9 +21,9 @@
  
  #include <QtCore>
@@ -35,41 +35,10 @@ diff -Naur a/base/ziputil.h b/base/ziputil.h
  
  class ZipUtil : public ArchiveUtil
  {
-diff -Naur a/rbutilqt.pri b/rbutilqt.pri
---- a/rbutilqt.pri	2014-01-05 22:44:57.000000000 +0000
-+++ b/rbutilqt.pri	2018-02-25 10:54:39.793852035 +0000
-@@ -69,12 +69,6 @@
-  base/rockboxinfo.cpp \
-  ../../tools/mkboot.c \
-  ../../tools/iriver.c \
-- quazip/quazip.cpp \
-- quazip/quazipfile.cpp \
-- quazip/quazipnewinfo.cpp \
-- quazip/unzip.c \
-- quazip/zip.c \
-- quazip/ioapi.c \
-  base/ziputil.cpp \
-  gui/comboboxviewdelegate.cpp \
-  gui/selectiveinstallwidget.cpp \
-@@ -156,14 +150,6 @@
-  base/rockboxinfo.h \
-  ../../tools/mkboot.h \
-  ../../tools/iriver.h \
-- quazip/crypt.h \
-- quazip/ioapi.h \
-- quazip/quazipfile.h \
-- quazip/quazipfileinfo.h \
-- quazip/quazip.h \
-- quazip/quazipnewinfo.h \
-- quazip/unzip.h \
-- quazip/zip.h \
-  base/ziputil.h \
-  lame/lame.h \
-  gui/comboboxviewdelegate.h \
 diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutilqt.pro	2014-01-05 22:45:00.000000000 +0000
-+++ b/rbutilqt.pro	2018-02-25 10:55:04.577357613 +0000
-@@ -114,7 +114,7 @@
+--- a/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
++++ b/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
+@@ -131,7 +131,7 @@
  
  DEPENDPATH = $$INCLUDEPATH
  
@@ -78,7 +47,7 @@ diff -Naur a/rbutilqt.pro b/rbutilqt.pro
  # append all RBLIBS to LIBS
  for(rblib, RBLIBS) {
      LIBS += -l$$rblib
-@@ -122,7 +122,6 @@
+@@ -142,7 +142,6 @@
  
  # on win32 libz is linked implicitly.
  !win32 {
@@ -86,3 +55,9 @@ diff -Naur a/rbutilqt.pro b/rbutilqt.pro
  }
  
  # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
+@@ -271,5 +270,4 @@
+ 
+ # source files are separate.
+ include(rbutilqt.pri)
+-include(quazip/quazip.pri)
+ include(logger/logger.pri)
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 0982dffdb4b5..88610ad3d9bc 100644
--- a/app-misc/rbutil/rbutil-1.4.0.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Rockbox open source firmware manager for music players"
 HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
@@ -13,26 +13,29 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug"
 
-RDEPEND="dev-libs/quazip
+RDEPEND="
+	dev-libs/crypto++:=
+	dev-libs/quazip
 	dev-qt/qtcore:5=
 	dev-qt/qtgui:5=
 	dev-qt/qtnetwork:5=
 	dev-qt/qtwidgets:5=
 	media-libs/speex
 	media-libs/speexdsp
-	virtual/libusb:1"
+	virtual/libusb:1
+"
 
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
 
 PATCHES=(
-	"${FILESDIR}"/quazip.patch
+	"${FILESDIR}"/${PN}-1.4.1-quazip.patch
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	rm -rv quazip/ zlib/ || die
 }
 
@@ -56,7 +59,3 @@ src_install() {
 	make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
 	dodoc changelog.txt
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index aeb6a3072494..8df0aaf3ca1d 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,5 +1,7 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 DIST remind-03.01.16.tar.gz 354521 BLAKE2B b4157922842af67408423e1b36ddae8f049e9c803cec83a7a11188dff5ccf7934ce5afc776bdc02acd6b18a8ad172180841a53576220791fb64230a0e1d54884 SHA512 61d72b01315d59a0e6f96006d5cb063752efad68119e2d1c4fcf6e6f3b2c122a7df47081c305f777fb2c6574e278e401446192897e48b4f93607db29db046550
+DIST remind-03.01.17.tar.gz 355331 BLAKE2B c3c45b58763a02c951ff5b890ba7ee657894f54ac8b235c7c0f5bb83385b7ae867d660dc37ed71f5f35bd17a5668a8ac3a99bc76c22c000642419ddf90b3fd5b SHA512 e5d98c9e2b90a9d31f1298f252c12ff6be378e7d1501e4a8d3361eb349bf50e89aa1bc6b6543f052f3ffa4113241816117a83eb144b8cf452cf0af8b9d0c8a17
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
-EBUILD remind-03.01.16.ebuild 954 BLAKE2B 8b33095cd29132b456850635a0aa0f84c727560c195fb2a25b0caed13c79b0172d51ccc51b2ed8aeb94d11ab16397b7e7943b0f14176eb6f79691b1f73a4b861 SHA512 6df5047af1b03dde5f0f850858d0f12c418f2c1efd25449f651f1e8a20909f5fcb60027fbfd276d21647a85fbca62e7520313a5449d930c1d3f7c8e2ed6bc1f1
+EBUILD remind-03.01.16.ebuild 983 BLAKE2B 5d5a79588ee01ac1f38b7dc3ec1f578cf56d8d52ef0763af1f0899c664071cd4cf1088d343724720fe180111764af3f1e9cdd85ef82e7bd73c85ef36604fb2ef SHA512 38b0b269e8b895ab448bfca58bd93dc4e50df9268a98aa4a3d3a42f2c8d49069cf41fec6c880e41f3988ff5be85622ca2a5e9287f0164f3290bf498bbe618187
+EBUILD remind-03.01.17.ebuild 1009 BLAKE2B 4963276ab6516b75b19c4ac6ac55c43e9a159c3edc67479a26787ddad1d3b250247c2eff2a4a412d0b63a0082f2488069eec524fbb7438b0c3411b25b5ad3452 SHA512 aea067292b56634e21c5241a3a1378df4a559b80f8dd0ba5b7068b9c9c9cfcc84657cb3a42b53944e2c034cdb61e41fcb2e39468e9ebedef3a0b3157cb524dd7
 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
index f63a17d39ff7..5a7755b8959d 100644
--- a/app-misc/remind/remind-03.01.16.ebuild
+++ b/app-misc/remind/remind-03.01.16.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Ridiculously functional reminder program"
 HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+SRC_URI="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/remind/remind-03.01.17.ebuild b/app-misc/remind/remind-03.01.17.ebuild
new file mode 100644
index 000000000000..b9b191eb4e14
--- /dev/null
+++ b/app-misc/remind/remind-03.01.17.ebuild
@@ -0,0 +1,49 @@
+# 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="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+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/cm2rem* \
+			"${D}"/usr/bin/tkremind \
+			"${D}"/usr/share/man/man1/cm2rem* \
+			"${D}"/usr/share/man/man1/tkremind* \
+			|| die
+	fi
+
+	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
+	insinto /usr/share/${PN}
+	doins -r contrib/
+}
diff --git a/app-misc/rioutil/Manifest b/app-misc/rioutil/Manifest
index 94f857578ce0..ac125f658ea6 100644
--- a/app-misc/rioutil/Manifest
+++ b/app-misc/rioutil/Manifest
@@ -1,5 +1,7 @@
 AUX 75-rio.rules 1452 BLAKE2B d464d692123599291d590c82c872feb99c3c7c2f92ae92c93ef45be63533398167e140d64755da8d8382ba5297bfadb9bb33966c0ab60192982ed9dc9f450f3e SHA512 e9d953045cf4b587eb19f95ef0f429fefb1919d335662455e62334331c99ede3304952e18c52d41f0051eedd4f8148c469c75db9600c70ba954281620f760a65
 AUX rioutil-1.5.0-buffer-overflow.patch 515 BLAKE2B a5aef116bd7612489f2036b27dd5c2e7b576ef343be8551f584b672286eef37dc2b52ba1d3aa7eea868d20bff22bf9ffe30b51d5fe09fa4d70a5fa8a44141635 SHA512 6face8d7dba4f34034683a1a2bcf01c18b4feb104da2b9e15ecb57e2fc26717e4f952bd03ebdbabb92b0c63c540ca0a29f637879533dc964817744972d48edc2
 DIST rioutil-1.5.0.tar.gz 401244 BLAKE2B c7f317b0e995cbe61122891681d9756b06aacd624cbdcc75fc2111d19b0493645558e31090660bc4a4ad2ebc3b284bbff637984389c3a18bcd838e763aa4a2a8 SHA512 3e3bf1c053e2f0146c504c5015e33cd3281daad136f41d82100d6181b6720c7f1131615c663f821573d7aeb077efc1b59e8e23a8f15a851e332ad61ea0479f1d
+DIST rioutil-1.5.4.tar.gz 84592 BLAKE2B 8efb92c3f178960d425c0b4733d061f2aa72767513621e379ecdc6d69509fcd91e38a9becd857e695f534f40ac7eaa3871c582df843f3b7b47298d48c0c18803 SHA512 b64027089a7c0a3b712486e3b2549dae5a8ceff9687a183fd411f6b9d197a97ea22bd7294242b3f9e8522da9ebe7e87dc5bc980633632ce3d4884341ee085a62
 EBUILD rioutil-1.5.0-r2.ebuild 775 BLAKE2B 00ac259a075413e069b610b4bb2ccc59158c76ffe2f4d3a52ce72fa2c58da1c18f3f31b81f485d412cd4b8fae3e9ebe5ebc42e180071ee674a7af4cc3c2d82ac SHA512 4ddfbc0dc5a778630e3ee61343a4c9c5dc102e7ea8d46ff5575930761f41d82240e1035209e9cf9ee54d3650c2b790b58b0f9946b9d6695bbb5607f848c57134
-MISC metadata.xml 244 BLAKE2B 67a050e1c66ddff4d4f247e66cec1a878bcab385f42c2160ac71fe510d26bf92d864c530a41427e5ab26632caea12d663860457c36b4cd4723ad2c8ffe3e13bc SHA512 01c88fac77882b2f5dce193f24b996f60601ef47bce8a95b29002be2477e45cbc5ee0b702c98d9b34583d488fd0a7c7cdc90648fa36e23826989a875c0e6ca77
+EBUILD rioutil-1.5.4.ebuild 844 BLAKE2B 5652dd104a1a2e827adca973fc7310a4f059c771ca8f0160a649f4ac2acebe5b9a8fc07bfaac1438661cce20189ec1ffaaebccfe64b6a429a7dc1cd217c34923 SHA512 a925122ce8676319245d3eeed88673902163d58ec256a3be963f35a8d33ad4c1e94b3cea5763113ad158ed3185afa49c19a9192133954e04c548d213a8af2287
+MISC metadata.xml 878 BLAKE2B 90d6de8c3ef6a26b7823c2d6d03c24add333e4033c869c80776831387363f0a127e9a520425390d9081fd6537fd0a1c0b6cfbd2bf9dbb28d63722e54afa11483 SHA512 e087877391095c7883817a9123f3a3dadcfe1c0c4519bb42ec98c62093280fac8ec83011fe2ebf26b5dd8f6b5e460ed6df8db3dd612acd40f831d82a46c37463
diff --git a/app-misc/rioutil/metadata.xml b/app-misc/rioutil/metadata.xml
index 531ee91f3d40..052a4bdefbf5 100644
--- a/app-misc/rioutil/metadata.xml
+++ b/app-misc/rioutil/metadata.xml
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		A utility for accessing various RIO media players.
+
+		Following players are supported:
+		- Rio 600 (all sizes)
+		- Rio 800 (all sizes)
+		- Rio 900 (all sizes)
+		- Nike psa [Play (Diamond MM version)]
+		- Rio S-Series
+		- Rio Fuse/Chiba/Cali 
+		- Rio Nitrus (Should mostly work)
+		- Rio Riot (No download support)
+		- Future flash players (Experimental)
+
+		Following players are unsupported:
+		- Rio 500
+		- Rio One
+		- Rio Karma
+		- Phillips PSA
+	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">rioutil</remote-id>
+		<bugs-to>https://github.com/hjelmn/rioutil/issues</bugs-to>
+		<remote-id type="github">hjelmn/rioutil</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/rioutil/rioutil-1.5.4.ebuild b/app-misc/rioutil/rioutil-1.5.4.ebuild
new file mode 100644
index 000000000000..6722b045c2ac
--- /dev/null
+++ b/app-misc/rioutil/rioutil-1.5.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 udev
+
+DESCRIPTION="A utility for accessing various Rio media players"
+HOMEPAGE="https://github.com/hjelmn/rioutil"
+SRC_URI="https://github.com/hjelmn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Don't use hardcoded '/lib' libpath
+	sed -e '/libdir/d' -i Makefile.am -i librioutil/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	udev_dorules "${FILESDIR}"/75-rio.rules
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index 3153bfd03786..3972957fb0eb 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -1,6 +1,6 @@
 DIST rlwrap-0.42.tar.gz 279608 BLAKE2B e8569d35cb0b8b3309af71122c1a48039fe559372648fe05c73f0a545c4efbae75aadaf80faa302033134cbd569ab90b9d314e2bd2c1bc387fd1434d39418245 SHA512 991885e75aabf0d43581d59f7c78f7f64c3f32072de08ff5796cba75c0716548d2186cbe2d739f3e772871e3586d036f069db73b2ee8a30b2f7985088d0f68df
 DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23476e7205cddbc8c5adbab4c5a10090d8ef04e9adfc62209f37f101bfc3e294e634379844417c80540485532 SHA512 4a1440b2eef3a1664c6381eb09c19f4030de2c0ef4f1f3509f7d6e130d3c5e9c3ceb00fc6ea6052b22bbe1f6b162f72e0b47564df34ccecc5220f195c22e86a1
 EBUILD rlwrap-0.42-r1.ebuild 524 BLAKE2B a91644358950129e12d6b74641b874f8102d8890d0654ce54f106f4516dc76a689b6ab06c3d7dca573127120cdad72ec2f8262fb9ce2ee37f14e378d161075d4 SHA512 6f8cff5a06edb8e5c2dc6b1cc72aa8704eafa79d8014175955a8b387a8825f90768c111facfe6d7fd7de1af4d92146b2539efccd7e0f772285b793376b78c1ed
-EBUILD rlwrap-0.42.ebuild 631 BLAKE2B eb01cac471f448a26d2277368c5bc459134f41c08bfd360203e58ff1fa7368ef7c100dbdb06f632d464d360ff33f71345466b5f1c19a2a9182750e53b3182829 SHA512 6e9c7d7750a40ba31bb64d17b0069cde45b06af3c19eb5513e2d4282da0dc9ac0fffafcf4101ee68548d812f46793d588ea58b1f0708bd155b103b775069ca35
+EBUILD rlwrap-0.42.ebuild 624 BLAKE2B 41647de4c2b5e7732db0c76ddec7b43dc9b2f815600730a57ef1d6cd2c8cb6104d8bd625f4d4f676c252acd602b42af5762f208a147bbafc11304d45598ea0ba SHA512 c377ae7f3da1b4bf61b3ef0332e79e29f9a4e85dc48cbe48d95165f919249ba45c9152e3bf858d03513c3599f406cb509641d771f02cc0c951e794e29d6c65c9
 EBUILD rlwrap-0.43.ebuild 602 BLAKE2B 8cee19013278beb1c218ea6730fbf5e8e1edf8e581e921843010be140f55db2c2fb68dd682fe0a331fcb3dd184e7951996ef9ae2ae631819f3b5eb33a39cb221 SHA512 8778074bdf47a91d2de60d5da476eef60f0ce5a18a351582fb47e97313d9e7d94c9ca5105ff8c317f6bd88cb72a5c657b269048257bc11798e520a2f2b2e10bb
 MISC metadata.xml 707 BLAKE2B cb970829cfc9eca1dc9dfc2cab28410f39c8a7ad2dfffb44d52e093653d43ff20f1a3b622aa6fe8c35091c79d45d1db1d4ab6244ad3d7d9c9083813dde4d17b0 SHA512 8f6da0c6c96533098cd750c1dc4cbae6d94bbf4a285561ba52a3fb1ab414ead6a4f1e1a600cd120cda4355a5c52365938921ee43df560015296f15528d79c8ff
diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild
index 75ca6471b3cb..3d2669f8328d 100644
--- a/app-misc/rlwrap/rlwrap-0.42.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42.ebuild
@@ -21,6 +21,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS BUGS ChangeLog NEWS README # PLEA TODO
 }
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
new file mode 100644
index 000000000000..9df1a0268e0f
--- /dev/null
+++ b/app-misc/rpick/Manifest
@@ -0,0 +1,95 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayvec-0.4.12.crate 26551 BLAKE2B 45514f09f0fd1fae7afb7dc812142ac8d88d1f4b81901db405c79dbeba2d29fea13ec22cb08a43433321931295a9f14456a300e814431b8fb14037d2f47529e9 SHA512 c03972056ab8fa30fc53fdc2bfc5e501f7644223998eccb73fdc2e737f7e25f4bb0e531f3eec38f7f3514760fb385fafd06c3d38531d13d92faf841820d4ed2b
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
+DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.8.crate 33581 BLAKE2B 491545f71cd215f6fe92b172c25ac3773dc1dadb87b16d764d91b30630251f6132981be7779756b2a1fec00d4afc83ae9d042cd6a1e6e6a7822efd303a3f1d6d SHA512 6c92941e411f957b5f2c02f1905380f55ed0f0313e22dd9d29fbbc85ba18accd06e2a8e7de01809e5fa7258a960f9545d3410613836b1dd3a26f0719d01d3bd2
+DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
+DIST cc-1.0.46.crate 49453 BLAKE2B 0d98a50251b69b0f11516f41bd638972f4f1e9cfe2bfe16c0a1a165e6e9baaee476652fc65f5261e73e6b15335c3e73135b40261c9633386223749f24400b966 SHA512 322a27decd36810120e923883d1acdcaf008a88b1ecbfad8e081e115b2c8fbc07efc85411682aa15ee9106b200e1a05750fcdc77d3961dc2a2c3c849880c5c88
+DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
+DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
+DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
+DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
+DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
+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.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+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_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
+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.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST rpick-0.4.0.crate 21810 BLAKE2B 5c7115be4d74302aa791337356278367f139a2033475b29ffc381c770d06e42f5aa1f21dd3e0182b553421af48c6669ed36b4f2bde1af78e75f4f5e5e0b9d993 SHA512 3560698aa2a917b320334ce2414b71f324731548850baf96ebed520240706eca1e57e4b02d79b01e67beaa89c7dd281cb6bccce361c7e8b5bbfce4eed1d2709a
+DIST rpick-0.5.0.crate 28232 BLAKE2B 878848091caa1906129d17ff601ebd41539791d2dba25b7c8e6eb8e463f9a7e2fc33d3bf37a515bad9dcb4f2fbde30c1c4f2772f9979f4d8cb1ba8a3a3f6a1b8 SHA512 c11b63081216071e74b655eaf72830ea3f154431bc12b84a23d4e2b2aa0c64ae0bb4ed7bb184b92cbe70747bac3ec28a6976a9690684821c34851a31e805b6fc
+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 serde-1.0.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
+DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
+DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
+DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
+DIST serde_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.2.18.crate 26373 BLAKE2B 88a5570ac97493e4324fecd2e93851ea162de3bea583eaa0b4d4d4879bf11b1ee0bc69a7ba67c2599c05efe38c5967058b58c6458f3a830aece831958477d820 SHA512 fafa9cea1a99950d1ef8bde53ab5a18daabd5cf131f3c2bacf25786f057b2d0169fe6f5d6e96761a74b6e9cf72a9d6b7dfee53edfe0018a19260ee66ba9b5f97
+DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
+DIST structopt-derive-0.2.18.crate 13088 BLAKE2B 022ecef6b8a341bec3f557b1f4c961d2e4a0555e3528abe9dab635f7476b48ccd0cc75e8f0bb9fb02de676742e36eb62eecb01851cd929ccae56da3128965c0a SHA512 b3bb2a2c1b28aa275ae25d60ca0a3878b715293950748fdd4ce5c791bc5e7fbf066db3bf4678b7a6fb3a61b2b2703ff14503f87db3659281c7b201b427c59965
+DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.7.crate 191626 BLAKE2B e97eeaea0d88cf87acf1ca9cbac0ed9a93357cf78aa1eb1fdac594c2f8a004a7b292f25e9af76ae119253279202a4b06eb99b1358e1048dd6f5b5ce4506f3848 SHA512 ce4bd04bbc231875b53b2c02a25b2594415ff0f0f886eb529da0686ad5bea60cf3a91d02edeebc26865f648aa6d2ce74189ffaa7d42920e6b8d13eff0b2b45e2
+DIST synstructure-0.12.1.crate 17424 BLAKE2B 59fde7b3cc83a6b8f1a829d813d96a299da7a2e48fc9305d6f48fd0e1edf3a699f8629a89b5f77caecf4d802584a58b6779457136218c5b8f13f79cc4cdd5ac8 SHA512 63cf2546f8b3e490ab50b710f133701d2915d81c3e66ffea446af8244695bfeb5c137c37e066ae5540b1ecd4139d62e59ecdcc29b19696d512ecad85846020db
+DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+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 wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
+EBUILD rpick-0.4.0.ebuild 1727 BLAKE2B dc3b15c8f03da3afbb97190e67e166afeb081854f113395943138f9120bcbfec11c043ea377578c49a762f6d3a5b99332605f8351244f9886556b0a000013cec SHA512 8ad855065c577b9dfad741a6db032793ed5c17b1b6ece0f79633dae076a0b3be86f7128274a8a08ab438a868ca7878068f05d97a6b31aeb674374c8db01eaccc
+EBUILD rpick-0.5.0.ebuild 1827 BLAKE2B e8cca4a2791fe05be973d1d0361f4d74dd24402f70fd0cf5fc023f104f7e84d279b22f68785762c765531bc5865a0c279e5eb359b83849093144ebf352757dcb SHA512 25b83420776ca2224c7ca1b7c5b6e895f4c36ba73dc56cef83ec58e8ec8e5622dc84c5f56ed4d9b78b44e0d0eb3215516fb364d269a75bdb7f7b161012d2a611
+MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/metadata.xml b/app-misc/rpick/metadata.xml
new file mode 100644
index 000000000000..eaf616922a24
--- /dev/null
+++ b/app-misc/rpick/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>randy@electronsweatshop.com</email>
+		<name>Randy Barlow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		rpick is a command line tool that helps you to pick items from a list, using
+		configurable algorithms.
+
+		An example use case for this is picking a restaurant. You might want to
+		generally go to restaurants you haven't visited in a while, but you also
+		might not want to use a strict least recently used model and spice
+		things up with some element of chance, with restaurants you've least
+		recently visited getting a boost in their chances.
+	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">bowlofeggs/rpick</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/rpick/rpick-0.4.0.ebuild b/app-misc/rpick/rpick-0.4.0.ebuild
new file mode 100644
index 000000000000..81020abaf456
--- /dev/null
+++ b/app-misc/rpick/rpick-0.4.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.2.0
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+arrayref-0.3.5
+arrayvec-0.4.12
+atty-0.2.13
+autocfg-0.1.7
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+bitflags-1.2.1
+blake2b_simd-0.5.8
+byteorder-1.3.2
+cc-1.0.46
+cfg-if-0.1.10
+clap-2.33.0
+cloudabi-0.0.3
+constant_time_eq-0.1.4
+crossbeam-utils-0.6.6
+dirs-1.0.5
+dtoa-0.4.4
+failure-0.1.6
+failure_derive-0.1.6
+fuchsia-cprng-0.1.1
+heck-0.3.1
+lazy_static-1.4.0
+libc-0.2.65
+linked-hash-map-0.5.2
+nodrop-0.1.14
+proc-macro2-0.4.30
+proc-macro2-1.0.6
+quote-0.6.13
+quote-1.0.2
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.2
+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.56
+redox_users-0.3.1
+rpick-0.4.0
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+serde-1.0.102
+serde_derive-1.0.102
+serde_yaml-0.8.11
+strsim-0.8.0
+structopt-0.2.18
+structopt-derive-0.2.18
+syn-0.15.44
+syn-1.0.7
+synstructure-0.12.1
+textwrap-0.11.0
+unicode-segmentation-1.5.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="Helps you pick items from a list by various algorithms"
+HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( CHANGELOG.md README.md )
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/rpick"
+
+src_install() {
+	cargo_src_install --path=.
+
+	einstalldocs
+}
diff --git a/app-misc/rpick/rpick-0.5.0.ebuild b/app-misc/rpick/rpick-0.5.0.ebuild
new file mode 100644
index 000000000000..c11bb5b083d0
--- /dev/null
+++ b/app-misc/rpick/rpick-0.5.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.2.0
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.13
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+byteorder-1.3.2
+c2-chacha-0.2.3
+cc-1.0.48
+cfg-if-0.1.10
+clap-2.33.0
+cloudabi-0.0.3
+constant_time_eq-0.1.4
+crossbeam-utils-0.6.6
+dirs-2.0.2
+dirs-sys-0.3.4
+dtoa-0.4.4
+failure-0.1.6
+failure_derive-0.1.6
+fuchsia-cprng-0.1.1
+getrandom-0.1.13
+heck-0.3.1
+lazy_static-1.4.0
+libc-0.2.66
+linked-hash-map-0.5.2
+ppv-lite86-0.2.6
+proc-macro-error-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_distr-0.2.2
+rand_hc-0.2.0
+rand_os-0.1.3
+rand_pcg-0.2.1
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+rpick-0.5.0
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+serde-1.0.103
+serde_derive-1.0.103
+serde_yaml-0.8.11
+strsim-0.8.0
+structopt-0.3.5
+structopt-derive-0.3.5
+syn-1.0.11
+synstructure-0.12.3
+textwrap-0.11.0
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="Helps you pick items from a list by various algorithms"
+HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+# You can get a description of the licenses by running cargo license.
+# See https://github.com/onur/cargo-license/
+LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( CHANGELOG.md README.md )
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/rpick"
+
+src_install() {
+	cargo_src_install --path=.
+
+	einstalldocs
+}
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index fd090dbf53dc..f8bd8f527a04 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,4 @@
 AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
 DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
-EBUILD screenie-1.30.0-r1.ebuild 527 BLAKE2B 6b8c4019e879c9906de2baab723389270b6a9535ae33d9e485cd408ba2e192c516c6f6d862d04bac2648cb686d90f478ad3d0c71dce24cf93afebc04deaeb6a2 SHA512 122cc74433593a8307a26d3d43e0e21eebd4e8804f4e01e0f3f522987502227ad032a984f2fdd19477df73f609da224f4dd252be1f31d8e6a449f3cf0aa4c5b7
+EBUILD screenie-1.30.0-r1.ebuild 505 BLAKE2B 972497bb77255c7f50ee32bb03a46ab0da65edb697e7aaea1656e7fd7b9d695c5119117e97ed3919eb19b08071c1776d8253b629e8cad85aec04665137b20a59 SHA512 99b089943330319642c2d7e7c6cfb0d6e34db79c85746dacf4e955fc90d3a6d3a6badb0b22fe48c7a688d7a9a0dbc7fc540dc640e2ff95760c095b0cd7803e95
 MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
index 8bfdb47624bf..13d51de9d136 100644
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -17,6 +17,6 @@ RDEPEND="app-misc/screen"
 PATCHES=( "${FILESDIR}/${PN}-CVE-2008-5371.patch" )
 
 src_install() {
-	dobin screenie || die "dobin failed"
+	dobin screenie
 	default
 }
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index 7aa3c4abdbd5..10878f6ee947 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -2,4 +2,4 @@ DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
 EBUILD scrub-2.5.2.ebuild 361 BLAKE2B 12c02e0203f651d963a8e03820e0c32124870f4501ffb0236652941a7a455342165107e852a84f2435e8a4732c57567ba840414292d385c8492398ff2bf08dcb SHA512 f03300f1f891d99128652209b056a90af2c5ca70dc693afd75c3846dccd476f5f129ce2ba92596f60ff6f2400182edbac31299a5109bd178c56ac748c22d4360
 EBUILD scrub-2.6.1.ebuild 384 BLAKE2B 2a0fc84c1694aeef2af97aa6d9d1d6ec5c41a3560df32ec41b6f45833f2623b7c751082afdae18fa90dd0af7408afff6b546b51eb1e744959de14e6f3920623a SHA512 1bfec404206dcfaf9667e840046efe9abd873b7a86842e3217af7209c4e2ff3bb313ef39740dace3367313951e9654fbbf4e5fdfd2dc1106165d4ec1ff9b66e2
-MISC metadata.xml 510 BLAKE2B 9817d83c7d276ad65540f04164def946802c84cd2e9c4032850f9a56fa9ac696653ad710329b6e366f50728ec85a5d75df20e46e1390f7a5a2473473f01d6c01 SHA512 765ffd0e734190ea3df782ae4842ed23a78857747b459865e41f017f995e7f364d2d04fab119d1d1f24d6a4fb7688a07e65e1c324189fef968f83a38ef2156ce
+MISC metadata.xml 427 BLAKE2B cabf19dba485a1ab72e0500c58039417e3d43a16221200a291fa24ccf071592bd6fc4360dcacf03f56242a3a218a4783e4f716253056384dec0da2dd60831b6d SHA512 6df40e1c7f4e9a5dff97a24cac6e0ec70ef4932846de7499be62bcd9bad40c5e23cfe23aac3672f1c9de4aadd36b6abcf96945cd8bd6c58a87ee91f793e0a627
diff --git a/app-misc/scrub/metadata.xml b/app-misc/scrub/metadata.xml
index 860304ffaf2e..9666afe61270 100644
--- a/app-misc/scrub/metadata.xml
+++ b/app-misc/scrub/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>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>Scrub overwrites hard disks, files, and other devices with repeating patterns intended to make recovering data from these devices more difficult.
 	</longdescription>
 	<upstream>
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index ac7b564712f0..edffed03fdca 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -108,7 +108,7 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD skim-0.5.2.ebuild 1353 BLAKE2B b9ce81124e4cceb55af348e45105bb5cc55ff1e21270534dc2e4fe2ce339717129e9e9d82380a3503aedfcb19106959cd0684ba41f0b06788baf8e7778077c67 SHA512 ee1d0d208c8b887487ad9e09a9ad3f144bb9838108036901495623682d4f5493082f5c4355798b83e14112903132b245df95eb46a9e4909552fbf40d0b0fb734
+EBUILD skim-0.5.2.ebuild 1380 BLAKE2B 279ac6b7f1680d6d14d398839845636c2c1dbb01fded90e31a811e3f1135be59a4847b1d36b1a8ac98739e6800960bba2f5f2ebc66845ee93eee1673efab3d3f SHA512 645a8e84250ada6d1d557ce78137c6c98eb780ea5654c24087708b4740fc9200fd417f0da0cf2cbdb11bffeeb95a9bc00392fb125c20bdc03c8c4d0f61e58535
 EBUILD skim-0.5.4.ebuild 1389 BLAKE2B b7a979df15c653f37dbd805e6d34095ce47f8869e355699c476febe75d51dfa61212a4153c6ba2de8ea2b8dfb6528272259a2b884aac1f95bb0e85c0ddcd2067 SHA512 eacdaa3d57aa3c362ff48541ad81c4d234549e03255be1b217e88c81c343f2af9259747d001031bc44a3c734f29b356ec830757984094f06e3216bf8b62ccbae
 EBUILD skim-0.5.5.ebuild 1367 BLAKE2B 200e4fdb046dbb5f16316e9c7dd390393fedc184e76d5a061b0ad1b65ad18171f76a49f334bd3ceefef41c4d3a95931bc375973c8fab804031508b8e54d0e444 SHA512 4df3904246b2f25ffed97eace185604786c412c0420433ce51352ac071148dd9f08e619e654e49436949662c25973534ae18ec01972e936a2d78ba989b9b456f
 EBUILD skim-0.6.4.ebuild 1998 BLAKE2B 31a28862d37f875671e5084b9568cd271aff60e76b450090e4f1ac140444f89dc4271f579b8ec3c61022155dcf580bd6388ed4d0c0ad3f0338706c0a0118645a SHA512 41d0873d8db5373f020e44c7fd5eb7f5ee5c537def71d355aac3b1ec91265c1f79a8cdc1ae3fca69fd85b2fdf6f0ee4d92b762175eab9db11b0eed4d2609dcf0
diff --git a/app-misc/skim/skim-0.5.2.ebuild b/app-misc/skim/skim-0.5.2.ebuild
index cc317a2e0812..33bbe9c0dc64 100644
--- a/app-misc/skim/skim-0.5.2.ebuild
+++ b/app-misc/skim/skim-0.5.2.ebuild
@@ -48,6 +48,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="tmux vim test"
+RESTRICT="!test? ( test )"
 
 DEPEND="virtual/rust"
 RDEPEND="
diff --git a/app-misc/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
index 2f32955f44dc..125d0ea55fe7 100644
--- a/app-misc/sleepyhead/Manifest
+++ b/app-misc/sleepyhead/Manifest
@@ -1,4 +1,4 @@
 AUX common_gui.patch 246 BLAKE2B f4b6c9889322f709a19673529d61d8719a55c692d9aeeb2a174ae86134fffc2216a77002ddd1544326e97ad8c0685c8311ad81fe660b22120c47718275b3be29 SHA512 952027395ac82fa3960c5efe9b98acf4a2232380a59fd9d71112ea57d26c94fc9f497e9c1c6e6fd48820f3042b16cc88d9f8b95285e857f1b5580a7e00acf442
 DIST sleepyhead-1.0.0_beta2.tar.bz2 3404013 BLAKE2B a5cf9fcb6a1c91786fffd2cbb2505ebc9608d83f5b6fc4e39fcf74def369a6fd1a40e23bf164c840956a9fe2f2c25ccf7313a95098eb6829632971a6a924ff61 SHA512 147a853bd77e6277b70d5d70f9b82f46c3f6328283c30b38d77e698146519367c9fa02f8fb21c687237657ceb78d7bc9ee07e4e8ccdbe41652ddd8dc55049eca
-EBUILD sleepyhead-1.0.0_beta2.ebuild 1177 BLAKE2B ba5fdec1915a40512342e4423611808770ec6646f9311e8ffa48615e883bbb9f2282fa4db65b71c78f864b0e5b7314fb088ca7c7182823d4a4a88d197a8057a4 SHA512 cc0e8514e6eec60d3aaa0aa0571ee779b79c4ef53237b34288cf3a05973ecb0d321ce6c74511e03d3e40cbc7abe1bab221cef5755b69df18cdbcc2469b7126c9
+EBUILD sleepyhead-1.0.0_beta2.ebuild 1156 BLAKE2B 62e8efbf1bf82e19df4974ba62044852ff3a84e23e79d382fe9ed229678f59facae66a2c3fd6d3f6211995e269d901ebd84f8893efe9d92ee63b81301b4cb4a0 SHA512 4481a5f26dc7f22e7ff34a05e35a32a07cedba753e8e532d0967ad52f35c2eb1c1ac4d5f97e8fe5a36a22204769fe7dd2e96c55f40f79b5f9c4c919e95b86637
 MISC metadata.xml 409 BLAKE2B 1777997bf87537da1a8337390065482b53fc2acae84137ebbc54fd13b221b8fc9c48a799ac9efcc6e4853f3610bab85a44679b5780fabaa0b46e1c5e20cedab9 SHA512 bd3522a2a682e51f61f5c38db6003365e06226a2015fe2aa81ed638852a663084da4d4d39962abb36aacc37462d84b706e4b35023e265635904a4d1874044ae8
diff --git a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
index 779450ed1051..dfebd75552c2 100644
--- a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
+++ b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_install() {
 	cd "${S}/sleepyhead"
-	dobin SleepyHead || die
-	dodoc ../README || die
-	dodoc docs/* || die
+	dobin SleepyHead
+	dodoc ../README
+	dodoc docs/*
 }
diff --git a/app-misc/slmon/Manifest b/app-misc/slmon/Manifest
index c7466580a2f3..ee96f8d60341 100644
--- a/app-misc/slmon/Manifest
+++ b/app-misc/slmon/Manifest
@@ -1,5 +1,5 @@
 AUX slmon-0.5.13-invalid-free.patch 383 BLAKE2B 1eb7d8b010aa10c795ca4f5114191a9c97de4e638bf2625d9492bcd258767108c9e801a0f43c442933ac95d61446ec939f809d64adf6a12f77ac220fc8d4a22b SHA512 6cad6d249367e4f2fda9d70d61bab64b6e083da727e1f23fe709c7579efaa3e460c5cf2f01c900517e126b2e9cda069ae8ef1239f731c72ea5728beeabfd522b
 AUX slmon-0.5.13-make-382.patch 243 BLAKE2B 5c926acf2ca9378cb860d70f57b2759b78421022027b9a33bccc20137953c42087f3e3115f6a2d275422680cfbc79926b1f1884e16308c439c2fcbde47350697 SHA512 613388513e5cd7e71b7ec45d1ea5db320f247d74024b52bc9e244c463e22103a165757939527837960aabddeb4feea958d772dca1a2d56747386c8a195beb832
 DIST slmon-0.5.13.tar.gz 103826 BLAKE2B 091e688773043872ec3df0c5dd4acb435ab4a99308e9a13bacae20baa0edf721cf9baed2fb3c33c2ec05085631a0cf858e1ca25b8c557d2aec8ea736c9bfa9a8 SHA512 84bf1e3eda9c05c7029630802b6853cba1c1220fd210c2a8f26f6ffafff3aa5a8bf9945b74ca508fbf4a9038b5df26ebed529d6377fab1df4dd778cccfd74f75
-EBUILD slmon-0.5.13.ebuild 775 BLAKE2B 8a6a8f4db6e498d931afd7a314270854152e71de88a4bbf59cdd1224037d49e200d65349b20bc8ff1a651e6ddb60a4aee45db94117a1e3d542d9c8738fde182d SHA512 19047e1c2fd010625669cb8c383ebf76f52087d201d0fb0f2b33fb02803d7344a27aee82fb8655674b61d97d46990b7fd01fb40e62d3de01e64e2b3217ce36cc
+EBUILD slmon-0.5.13.ebuild 768 BLAKE2B 977d03c38f12c6874454a795555a4f6a7965c5db5741b566db9509ee040f28806499fbba1e290340092e7b42735b532a0e872d841f4df6d0e8adb95b0d1c23e4 SHA512 067b9dd185a9021d7956954e4029fde6a8d4f36b52087b68240e7e5c207d51988817dc0db035a890afa9b2047f56b916b28eebd4ebfa7691b48e978fe97ee60c
 MISC metadata.xml 242 BLAKE2B 896a9044e8610aae2f30f8782352a32c8765672389ef80eb61eb815c0a70b58a06a991be3700219411c5bcc0b84fd81ffd9d677133d8312c5f265b7a011c57c5 SHA512 8a2bdc32c50597dc61771f9bfcc3d01ddb46cca9cdea7dcc831aca2eafb0746867b49b90885a24e8b8aba0c33a7c174da8955486a9843e50b3e6dc1c9720fd3f
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
index ee5e459384f3..d6edcbdd9074 100644
--- a/app-misc/slmon/slmon-0.5.13.ebuild
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -35,7 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README slmonrc TODO
 	dohtml *.html
 }
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 5f1bc7d48aa1..0cf8668b8436 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,8 +2,8 @@ AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3b
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
-EBUILD sphinx-2.2.11-r1.ebuild 2773 BLAKE2B e9d0bb5f8dade5b9802160be4477b7d514f372357816607fd15ef497d9f9bb82b9b0a44d8a657a9219280113d7abed9fc1599f86027a312f2d2faf8ab8d7646f SHA512 20e0e2819a83b609623dc62887f09d9ea1a6eb93a533370f8f8b21ebcebb1869839171e238b0bedffda722e405d0ffb140dc5d31d22d8bef770a6737840c635f
-EBUILD sphinx-2.2.11-r2.ebuild 2840 BLAKE2B a3b67ed5334f21c3ca8313740e57cc47bd5f76983e30ca483f64c16ced32e63f886f4f3d5cfe7350cdd4e363d7fded6f08384d79420c11da12a600d71890f916 SHA512 65bfae7ebad420e08b540ea7395f47e302ee1fb8b5c59ce40f4ab3fac0784547a199128c28dd12b10867323e3ec1a093ae18b8bdd7dffb913d4a099efdf08de8
-EBUILD sphinx-2.2.11.ebuild 2403 BLAKE2B d48c34fd604e6df0c652845bedb1f2c35046c1db6601ed995602fbfbd042a035d7296c1824eb29cd611d35408d821fb2c3cfb75b14ed87c865d416fe8806ac8a SHA512 6be2c83feb3edfa0c4b8fc80311fcf17099215da2006e706df7c5f556b248bcd269fa9f5aa752d0466c5bb6cdf656af0c4562ef9783c40bcbe84207b7a264585
+EBUILD sphinx-2.1.9.ebuild 2276 BLAKE2B 23dadec2287d6daa353ff4de49e92cfe08f74f221c09a2c566c16d300eb55e64919eed03036e40f1710438fcc5fca32650c7a7604c0a354dde3fd451cb8f764b SHA512 3f19e5176e557a0b6ab8f58e4bd6c1b9415cf709dfbc138d901c1f9133c2430f02a41ae5f8fbe47ab7375a244e9277952d910e396d01ec52549dbadeb10dedae
+EBUILD sphinx-2.2.11-r1.ebuild 2649 BLAKE2B 716a99dcb60197e6ecab580859584193e316188cd7506c082e13e7d426b9b91faf1473ff17f76bccb1df0a52d31dc728d1c3dd0f478bdedf264ff52a9c7406c0 SHA512 4668953ca23357159cb06bc37fa16faf964c9384836b1662483decd0f6c44d4638c03f72ed0d3f0a9a9d7f5dde85a74eb55061d91997f4148f3e6c25808f89b8
+EBUILD sphinx-2.2.11-r2.ebuild 2716 BLAKE2B ba78dcc03cdb71dbe8bb5d8e1dc7ce08cf6bd54a34b50882176e99c1d0196e1da2a1eafd108005cb7a7f50c8a41473bc3858c84b061d1ee1cf5e80de0073c2a5 SHA512 cfce0dd3e4ce121f7f8aa37d1b5070dab63d6a6cf42b30dd9c8a7e3b9ca1c1ec6d79770ebfe58c002cfdba3e4f27269e0b5526e89c55600db9c4ac242df5bac9
+EBUILD sphinx-2.2.11.ebuild 2279 BLAKE2B 601dcbe740021c053557f2d0716160f62cf48c0e1e851762b1f8ca67a044b04a7c57183ca749edeb060bca2cec7e8473f2488a0c2e2a5cc22f54a214069dd40b SHA512 63c115cc1468c29bd3509ef7ec607c36cdc182be53a3744118c31652e4b029a07fc2d6c7b0ac5f251fc6992a01141ee67a39fce42d6795144e6c360f5bc5c54d
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
index bf55eea2001f..843e49c094ee 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
+RESTRICT="!test? ( test )"
 
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:* )
@@ -64,9 +65,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -75,8 +76,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b3133ba92eb8..5f45a59d12a7 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -87,9 +87,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -99,8 +99,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 7bbac2622e51..459f921dc69a 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -88,9 +88,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -100,8 +100,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index c49c70b819b1..3889473b1575 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -70,9 +70,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -82,8 +82,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
index 85f64670c7c1..3663a974cb0b 100644
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@@ -1,3 +1,5 @@
 DIST terminal-colors-2.2.bz2 4826 BLAKE2B 8a0e2918dd4fbeade61a683fd965b947fc0acdd01be028ddce3c42831e563d97e2bbc260a9781ee0d7cb1d104a9be06f3a5bc78d9725b4cb100c172b0f4994d4 SHA512 ddd1a3cf6786011372ca83b3fe86a88c863a1fa1b5cf8450cabd364a3330847145cf4bd5eb8d50baa7c26b17c392eb0f629007dbb765b36b3904d0783216ce36
+DIST terminal-colors-2.3.gz 5424 BLAKE2B e08635c0e989a430805159829b133f18b7c30959c945e4373a77442ac15628bb8bf3a5a2d14cd4f5705a5dd332297fa3d41611b52f56baaf9b1a882c26626714 SHA512 64fbfe766563c4c25bec23d1657187414f97b6f92e8a4a35337563210ef9873db495376676ef0a2f4e440ad77a6c1b43ee9c27fe04b34c2839eb4fffd5289a00
 EBUILD terminal-colors-2.2.ebuild 605 BLAKE2B 60594390380655c6c66fff101820349718036cfbd7da9be222a389ddab3b83d794315bdf258fccf0a6dc3bc2c84d8f49bae80e2caa159cdb4c6e281d62f47917 SHA512 b2fb9886f0b0076f0809496f3263f878d8d93b92618d874cf244a53b5804ce076ddeb00c3c25444099df3d97fe3cd9f8807d7c1844f8dc95c2ef9568fb2ffa44
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+EBUILD terminal-colors-2.3.ebuild 614 BLAKE2B 64796649e7910a5aad79c67a74a01c6a2ad37f14ccdfd0abb7d2c9b18ad964d04117e8b81ab5170437930192d1361ff2eaba5df39d3479fdcba85b324bf0c5c9 SHA512 4f5f431496100c6800609036d633f41b142397269761f83e3734a26ef63478ed60ceb1ff1409033dd746f943799ab250b6433b0ac8828de28c0b42467a314e7b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/terminal-colors/metadata.xml b/app-misc/terminal-colors/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/app-misc/terminal-colors/metadata.xml
+++ b/app-misc/terminal-colors/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/terminal-colors/terminal-colors-2.3.ebuild b/app-misc/terminal-colors/terminal-colors-2.3.ebuild
new file mode 100644
index 000000000000..debf5805c359
--- /dev/null
+++ b/app-misc/terminal-colors/terminal-colors-2.3.ebuild
@@ -0,0 +1,25 @@
+# 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,3_8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-r1
+
+DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
+HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
+SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}
+
+src_install() {
+	python_foreach_impl python_newscript ${P} ${PN}
+}
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index bcb9bd2f7dcd..b920e07bd5f8 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,5 +1,5 @@
-DIST tmate-2.3.0.tar.gz 611262 BLAKE2B c4e789b20fbfb1736eacbf36f368d8ceb573937ed2c72f2b79b8da175a811985af12d9823fdbade9ee3f72bfb43427e8fa64eea75ba5fc3cf64273c31856d4d6 SHA512 b7de8f28ab5ee8ea389d4882ed64de3d71bd53d626ae6bf323d5be732066e63a7dba2a85318c0202a088af53df7e0d976256c1253895ad81739d270ee65d0eb7
 DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884e6e6ccd252315bca689b1bbec7a53cd131f0f36a6bab5b1defd3acb26bb458684894c81d676d2585db4790b SHA512 98531e3a3c1cc4da11894e8298df560fd58f1ede6a81ac8cb5f8cbea86f5c21672a016977dab801ec06e14f6c718a64599a9e32740934fcd4c0a155f92710520
-EBUILD tmate-2.3.0.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
+DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
 EBUILD tmate-2.3.1.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
+EBUILD tmate-2.4.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.4.0.ebuild
index bdddbdf93b17..bdddbdf93b17 100644
--- a/app-misc/tmate/tmate-2.3.0.ebuild
+++ b/app-misc/tmate/tmate-2.4.0.ebuild
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 04083946b14e..846d066e57f0 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,5 +1,3 @@
-DIST tmux-xpanes-3.1.1.tar.gz 51507 BLAKE2B 6fdf3a6cf7faecde33d9e51d6c40dd3b8bbabce1f63f7f5a0afb866d6ccece623c9867b542ba54b478861fbfc7472cd3b3bd378d577faf3d32eca88bf1e82538 SHA512 fe1fd5ef698c4069c4c5c078a10f602642b0c260a8cccd90796b79958fbd655f99bd69884978b8c56df20190b808d17e54fdc9ef40426707344038ba8601884f
-DIST tmux-xpanes-4.1.0.tar.gz 61942 BLAKE2B 66467bfce249648eb88235eec64730d0fcab6fa7c3a77b207c4ad4fbb5a2a2998dbcbeecf848af15fae35ba080c950d2a82e154d1944cca7ca87f407a1a64d35 SHA512 3a25b694a9d559958e87f0deac3674e74cd8acde8392045fb8cf5262a0634938f7e61cf638066ea8836c475aeffd2e8aed3cee9b354ec2e88f05eb19d5f6dde3
-EBUILD tmux-xpanes-3.1.1.ebuild 691 BLAKE2B b8c175b1dd8fb6679c3d3f408d79c0011a00bf0e4fdc3cde75cb95e08a984eb94fd65260af4137537e2f9b2a3da6ae64d5d85928e547526752e3664e38fc58a1 SHA512 f2cadcf49e4fc4b44cee75bb3a3202469fcfa65022085310d880da0ad23061f66a09e00a6b61c912dff2af81faaf1798f690ee807d35df00ead88e9c7f651251
-EBUILD tmux-xpanes-4.1.0.ebuild 693 BLAKE2B d09b06019b320c6c5060d67882c7b84786dcacaf120818411576874c5e5e72499ea06fa86e88eaa01c011632b2ac8f2cd5398368e8e1afba1ddc338c46d22875 SHA512 884515267c078174903d9b1e98661625d4b4faad0ab6689cac1d2522595ae21144c57d025cad76278c77887a56b006c90be7f2198cf118b22ceae24be8e98501
+DIST tmux-xpanes-4.1.1.tar.gz 62564 BLAKE2B 195221c5f069048ab42a57a00c4c8b79f0c2acf1b0cdd7096e553c9a5ed0b3e3b3e9dfacb8f2eb141861b34ef52ad0a675fb501e314d7e4bfe4a41ff4bfd9f35 SHA512 789e19136faa939670cf8e91e7e7979fae8e536aeffdad7d39e1861e279214985d40807dc07afcd8b28cc4de140a944c9b2f5fe051a6b53e12b7903baefcb251
+EBUILD tmux-xpanes-4.1.1.ebuild 691 BLAKE2B b8c175b1dd8fb6679c3d3f408d79c0011a00bf0e4fdc3cde75cb95e08a984eb94fd65260af4137537e2f9b2a3da6ae64d5d85928e547526752e3664e38fc58a1 SHA512 f2cadcf49e4fc4b44cee75bb3a3202469fcfa65022085310d880da0ad23061f66a09e00a6b61c912dff2af81faaf1798f690ee807d35df00ead88e9c7f651251
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.0.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.0.ebuild
deleted file mode 100644
index 75d8c2d638d8..000000000000
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.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
-
-DESCRIPTION="tmux-based terminal divider"
-HOMEPAGE="https://github.com/greymd/tmux-xpanes"
-SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="zsh-completion"
-
-RDEPEND="
-	app-misc/tmux
-	dev-lang/perl
-	dev-libs/openssl:0=
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-src_install() {
-	dobin bin/*
-	doman man/*.1
-	einstalldocs
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins completion/zsh/*
-	fi
-}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.1.ebuild
index 389f67028568..389f67028568 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.1.ebuild
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 6a396c43e90d..a0ba94ffe424 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,8 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
+DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-2.9a.ebuild 2303 BLAKE2B b29d374fcf5d6b9bb33b1276c5cc8edb953ff99d8cca04ccc02b0ea7a4381aa05114f58596d72e76cd8d2e2c3084d1b9b2fb988f58299d79cb0cb8eaa9ac6ab4 SHA512 53d231733d91b9f8cea295715e29b70c778bc66ffe6b2ba3b25b906535002f41f934e95731b8ae254c105b5d68addc359eb0a99d4729f002512f462fd999880c
-EBUILD tmux-9999.ebuild 2316 BLAKE2B af43a63f58a79848de0ec6f00e5a945fd463d225afae30d81ecb33766bfd0a2d111fafc363c05eb85076b3216e4956589c0062c3aedbe0f62370022036e44346 SHA512 f6097f8e6a66e9c5705a8f33f8fd0c9f02e9e584245d2318eeb971f5fede131361d2bfb690da2a5f300668edb2d6ccc84de17ed3ade83bb6f0b07c5eef1fcb43
+EBUILD tmux-3.0a.ebuild 2322 BLAKE2B fefc176ff96de70ed1028c57b2fe03e43e76f8f36c0cf550dc2eeb127edc02de5ef3912f36ef28fdcf17ebd8ed01ed76e731cb45ee0e8c83be6728f826a45ef4 SHA512 237abb059a62382d5f1c6feb7eb30dcd4661a8960750c96c7506b4616053b7e9b79336633a3b30c88f456a5b1edd3ff67b8bbf923c6cc2e98d9f4293ad769240
+EBUILD tmux-9999.ebuild 2331 BLAKE2B e5ecd802cbbb6f878f92d93124c5b2a7bcfe3dbaec745c00b443a190152fe312f94ee1a68b9ba651b323ffb96a8ac4fda6427db2838812017c4d2e7c8c12ca89 SHA512 272452b6892f33474b06f0f1af6fc5a95870cb9c220724f51c7d3ecbb5e27b5aea235e97763c5c4c53407a2825ed65c1530cc807fb3d568fdc4fba2095c8e9aa
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
new file mode 100644
index 000000000000..2d07251c2cd0
--- /dev/null
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+DEPEND="
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
+	utempter? (
+		kernel_linux? ( sys-libs/libutempter )
+		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	)"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-flags.patch"
+
+	# upstream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable utempter)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		echo
+	fi
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 0a214c32d460..350d8121d213 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -31,7 +31,9 @@ DEPEND="
 	)"
 
 BDEPEND="
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	virtual/yacc
+"
 
 RDEPEND="
 	${DEPEND}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 1b5336ed5c2e..cd3527394422 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,3 +1,5 @@
 DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0
+DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
 EBUILD tmuxp-1.5.3.ebuild 892 BLAKE2B 468cdcc2f3799bba0ace9c2c34685c1441dc680dcea0a84ba65fd15fb642ab4f00612851d0d57bea7fa8aeaa71bb65db74d4d542a265d84fb53b5b734c7f2d85 SHA512 b659ad7c362c5d4f0b77a5ea68e7a622de6eff6bff931709712fe79b1cd3df963ff1f904410ff72068655bf2a6b0fd60fc6b4fe5cb7a8b9337b43451a7bd6f0f
+EBUILD tmuxp-1.5.4.ebuild 969 BLAKE2B 4ed2510917107dee0f6bfae4d6ec4e6ad91ab48121d72bd78a3116ad563b7b6ffe7ae0a52962f6dce99172bc89f6eebf541ba2f10dfe8044cae37848a701aae8 SHA512 76eff2f153c51e8097f0b37f720f61a7f8732115a0282dbc50391df8ad5cf7a6eba76cad9bfefd5aaa1f82577c1103372631326fde850a9865ef1905cf43e893
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.5.4.ebuild b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
new file mode 100644
index 000000000000..b801bfdbf430
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/kaptan[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.8[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index f18afde93eaf..233c8e9855ba 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,4 +1,4 @@
 AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
 DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
-EBUILD todo-2.10-r2.ebuild 1382 BLAKE2B ff3db41a533a0b4ce6ab4ff531cd2fdc77efdaf791ee4dbc910ca3406dc5330d5ad457ec7ebd3546b0ac21ca4ad89b17ac3716fa3cd9940a254bf721eb5326e5 SHA512 65deff8ee79cab1ccfafeff098960bbe5c9c1585d48f55c5beb112fbf9090bb15b50e29ea6d3489ba581b80d0a413d47987edb3a6d595af96bdfbd7292bce203
+EBUILD todo-2.10-r2.ebuild 1406 BLAKE2B a1bdc12885d8b93370373adae8be4d86bb12db6b2d845147d7a15c75267e570fbd0a7b386306a712ebed2c3d052ad6065a822c578148f9241c8e7104847960b2 SHA512 8b8abbfb387d5a07f8929560e4338fd64db09a57e36cfefd60e1d1dcfdd6742c09a8f0ab3576da4ac3c040336b5e2f35c43c2ca9516cb54a58728373799fec74
 MISC metadata.xml 340 BLAKE2B 8102ae5fb34dd55116c96b815406f86d08345c3e039d5c2878b8e7f8e0e4d6a60543ae7cbf9d2ba877230b40175dcaf6e7eae6d7877ee536a6ff30786e660584 SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.10-r2.ebuild
index 69c2994478d7..90a86a6929da 100644
--- a/app-misc/todo/todo-2.10-r2.ebuild
+++ b/app-misc/todo/todo-2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-shells/bash"
 
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 2a8edaabfdad..04d0e48a907c 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,6 +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 4595 BLAKE2B 94fa9b2b1c2fe61ccb8e04f3f51f4db73773816be5bff1a3091da0b576f410fd9530f74a1f92981926a09c7bb86eb8334a2519781acd2f248ff8f7d5467e5a38 SHA512 75814fc5463c2ade6ad39517b8f80147b27205e6f9dc3b11a3bd2552fdc958c79b5d2ac7166214d1d1505a75c175d21ce7128f4573004f3d78b280e5fb9c8c2f
-EBUILD tracker-miners-2.2.2.ebuild 4698 BLAKE2B 37c5c5e4b12718f728de7b2a520bb2686aa2fdc533fddf1e859d895ff9e33e4b2f40931593d621460d8b646182753e68b05c26bef59b6a56d270306ce2b9df1b SHA512 e67af323d0362d32c352a3fd68e7a414c5261a51c170737e2c3cc544e86023243e9846c3440c9d0668decd87e95ae83ec722d049192b98a3735b838c280c4d25
+EBUILD tracker-miners-2.1.6.ebuild 4622 BLAKE2B 889dab1b86e580ef8280cbea89c72b0c7903a121f3fd4bca1e1bcc61d5d8a8ef4640cdfa65c8c7644f9143878870b143f1989eeb0aedc7d7873ccdd086dce495 SHA512 87cc80f861097b93aaa13690d8dc0323c122a954a930d0372297695d463e9f19c7e69d232e735b9af171762661919881bba61c463e2367cb0f3abe58b9a70a2e
+EBUILD tracker-miners-2.2.2.ebuild 4695 BLAKE2B df24bd5e644d8b287c3f16c2b7543716c4cec48dc8abdfa6eb059adf3516b2db630c7bc9e208e92d8b4eb51635626078475e3ae1e497c234937cab989bd66887 SHA512 e0c4fd2b8d78983068cbbbbc9fb496a31b5645f76276598f715183a4ee7ef60addebf8272c0f8660aa9b3314073aff39b62ae9492749499a06034105949b480a
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
index 0f2412bd0b35..90a3454283d0 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
 
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
index bba9670ab646..57379e3ea6c7 100644
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist ra
 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c3e80362247b..12b3444a85b0 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -6,5 +6,5 @@ AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d52
 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 3048 BLAKE2B f527d63e3ec0329a3f8cd4aea893d75af331ffb1e6a7f1917eea077c3315d2f4ec015c6a5f4e73923eea906bc865ad5d05a9ebb1a32d5437780d79c673b2dabe SHA512 2ecbbd4d9132ea0ed5ea344e737dac175ee257f167227bf5dc8526f0f5b5b1bfe1b85c534e469eef29db79abdd8dd0dc5ca876858d8c4e0f15ea63293cbd6bb5
-EBUILD tracker-2.2.2.ebuild 2595 BLAKE2B ecdced5a62924ef6732bf3aa0b8bb3430838d416544a8c17ff7eec1d826d7a351ca68f056ec84b03326b984a3f6db7e6b2f2ef8aa7d500f6766ad04f321bf932 SHA512 6fd5e1ec34cb32587b6dc448ad36b3db485d449ce92c3fc855a448088bda7b885798b50dafdd49942b833d4bbaf3d68552be2c6a5a8c704413eaf281fa887107
+EBUILD tracker-2.2.2.ebuild 2592 BLAKE2B 16cb0024230468772a77a92eb998a840cec74b2eb5dba6979fd1a7266863096026186f89061b9fb59241295e8c0a87caf982942cc61d21cc3c8b2b3620877cac SHA512 75d1d2d562abe94723f67ea16ade9975023a5068daf87e93ae57bc3cb420e7d5b1b71e45f467b7cc4a84c29d76927199e809d56c685aa1d45d992638cfedf1e3
 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
index 83eff7211bab..9e06a84ff2e6 100644
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ b/app-misc/tracker/tracker-2.2.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 #RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index d0ff6d56ef75..c96937682f3a 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
 DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
 EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
-EBUILD trash-cli-0.17.1.14_p20170816.ebuild 689 BLAKE2B df1530e4cedb7cda5736e56fd99b60a8ed91b0ebe7b41a9801ed6a51d3ee78d1979a0d85ee42d346015f07f75c10a9bdf5963ab3319d51390b1f9ddf6dea8233 SHA512 6fb15191afdf5bbba66c2480b1fcbe76c42f5a780bff2e5e1a5b8e40abb17b0eedc4e563b6d45de66432c7e71165f9794772c15291e7a6b50caf834ea82c5a81
+EBUILD trash-cli-0.17.1.14_p20170816.ebuild 716 BLAKE2B b64a522bddeea46a30823970c43974497d4d0267d813b822c82d07d2bac533667f7c4158a7b4496f30395a838fa44bd59d1fbc54b30ca1c4df70d339748f6615 SHA512 7d4a0c0c3ad0fa396732ce0e1e5772260cda8ae3d1d0ae638efe6c86e7becb7a5c447129743093e935dfa77ed29f2f681d9900ab22164f2ee7fe48ebaadbd5bc
 MISC metadata.xml 1064 BLAKE2B ce5e59cc568a0542a0f94bccc46521901384ca856adaf922db9a62a4d45b86e9d179e12cff203fa8a2813131882116310122265805d54d1303b33e82680404c3 SHA512 8f74a9665e4d72c4f7dde8104189ab55d0a64c1e79abdf41920ff1ca425735cb76ce0e5fba044aae2608151086c8b0ad8a552dc15b7780c6086b8ca36d856068
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
index 8a6df74f1953..562153663745 100644
--- a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/app-misc/unfoo/Manifest b/app-misc/unfoo/Manifest
index 0278827a85a9..f1eb46f33219 100644
--- a/app-misc/unfoo/Manifest
+++ b/app-misc/unfoo/Manifest
@@ -1,3 +1,3 @@
 DIST unfoo-1.0.8.tar.gz 31862 BLAKE2B adba517a24a1fde7e1733b10a0c69d1ee5b0827adfadf89a7073366f77bfa2439413c1ce682d9a6d24f8b7b0402f409c84754f75dd5ee31c03ab51ffe3918f81 SHA512 b4a2489ca4ae5a81feacc57aa7c9c6437e3fbb0cec997d1b5e182e9ea7e19c13998968f23094e78908e6d41e699d50a1353ae475ec32146c63298eff06182281
-EBUILD unfoo-1.0.8.ebuild 1257 BLAKE2B df7a151daa8ebc3ac5ec29489ff9852d9efcd76d5f9b654b3f96ee1e6f2df545cf4cf7851ae37c4f6175d3bdd1e197ec3070ba3609281ea0e39b0c352adf1b00 SHA512 482c1a29dd5d23ce398495b0838257d4ffa41e4a48ee1fbb616e7c590e83a7d5309d23f211263af966f7e7699e52a651698530cf7f502c560bf4ff7c1bdba4b1
+EBUILD unfoo-1.0.8.ebuild 1281 BLAKE2B ee184bc3c7dbce1f36269fe5b1b9fb54b96c4588a68c10d228f3ca85835e6ab58749dac99d0b19c395555944474a0a130d2481274d3bfdb397e21121eeb9c42c SHA512 cf38734e031235164849090a7d5ef28faf804c067e9977d890ec2f9f42b0bf0e95b7d50da2d72d664772e68661cc46a4d5a74a715b2659745b928290cd88e78e
 MISC metadata.xml 443 BLAKE2B df80de233a6c7d23093b4770b2f4064c389ae85837b7a405a1b3132c42bd050ea99b6ff922d75d118e616c011191f4d708a0080b094aa40e938fcefb556f6f14 SHA512 d51afbee4941d3a6d5239b983e2beec524d9991c67131f691cf0f424b4ab5e798405fe89f7d8019c912a4e54413bf38f611bbb1574c4cef809440d7a1a60ee3e
diff --git a/app-misc/unfoo/unfoo-1.0.8.ebuild b/app-misc/unfoo/unfoo-1.0.8.ebuild
index cc38a96c3784..a6c641e8024b 100644
--- a/app-misc/unfoo/unfoo-1.0.8.ebuild
+++ b/app-misc/unfoo/unfoo-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="+minimal test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPS="
 	|| (
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index a049679042af..9ca32264904b 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,8 +1,3 @@
-AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
-DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da650922b71fc1d6ef107ce51af9a4b1155fb699f800cca452e644345568af4cf17170dc15509393df529336b3959 SHA512 53f45824ffdbd987fecd3a7f7b6d6c5da036aeb3ddbb219d7665a63cae55d68db608239055b18b88a721b39002fcf57cbfd88aa366cffb02ca5f2eb94a206eb2
-DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
-EBUILD vifm-0.10.1.ebuild 2112 BLAKE2B 1f7c763cd3953780b6324a1b7daa4ba70395f9f9e44e7b2271f42c62227c6b8fbaf1db08ba096398609b2524773355af5c2c7404f0844b487a290caa6f41c8c9 SHA512 79bbbb31db8361dd7fff1d33f0bdd691547d5f64481bd5109e8485abb03cdb59891cf66629682448d03243adc28201b073d60ae1f116d507aeb4d5833a3f05fb
-EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
-EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
+EBUILD vifm-0.10.1.ebuild 2109 BLAKE2B aad52868d392db5234ca53c2694afdbb5626afc61b277b5031e76f08d859af76b26813eb689820c2f2d54c751935721515083f3cf7be35c94527eed736cdd4f7 SHA512 7f2ca99051e8e0dcfcb9bdbe1783e783cdf9c02f2f6b9f4434e16701cc9cacab77cc19014f202c56c3a22f5cfab1dc4163266cac51249f4c17a63c93bc3d2846
 MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
deleted file mode 100644
index 40d41dcc8f17..000000000000
--- a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8196704a5dafa4c8e194f1643728ed45b4b55df6 Mon Sep 17 00:00:00 2001
-From: xaizek <xaizek@posteo.net>
-Date: Mon, 9 Apr 2018 19:31:06 +0300
-Subject: [PATCH] fix ncurses linking
-
----
- THANKS       | 2 ++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/THANKS b/THANKS
-index e708f4d3..faab4f8a 100644
---- a/THANKS
-+++ b/THANKS
-@@ -25,6 +25,7 @@ c02y
- Carl Mueller (carlmuller)
- Carlos Pita
- Charles Kauffman
-+Chema Alonso Josa (nimiux)
- Christian Fillion (cfillion)
- Christian Herdtweck
- Christoph (informationen)
-@@ -128,6 +129,7 @@ Richard Benson
- Robert Sarkozi
- Roger Bongers
- Ross Hadden (rosshadden)
-+Ruslan Osmanov (rosmanov)
- Russell Urquhart
- SanLe
- santhoshr
-diff --git a/configure b/configure
-index 0054dbde..a3c9bd43 100755
---- a/configure
-+++ b/configure
-@@ -8707,7 +8707,7 @@ return curs_set ();
-   return 0;
- }
- _ACEOF
--for ac_lib in '' tinfo; do
-+for ac_lib in '' tinfow; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-diff --git a/configure.ac b/configure.ac
-index 61b3ed5d..65e550a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -437,7 +437,7 @@ AC_CHECK_LIB(${curses_lib_name}, initscr,
-         CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
-     fi
-     ncurses_found=yes]
--    AC_SEARCH_LIBS([curs_set], [tinfo],,
-+    AC_SEARCH_LIBS([curs_set], [tinfow],,
-         AC_MSG_ERROR(could not find a library providing curs_set)))
- dnl If libncursesw is not found on OS X, check for libncurses.  On OS X it has
- dnl support of wide characters.
--- 
-2.16.1
-
diff --git a/app-misc/vifm/vifm-0.10.1.ebuild b/app-misc/vifm/vifm-0.10.1.ebuild
index 721045586d7a..0b697df0c6e7 100644
--- a/app-misc/vifm/vifm-0.10.1.ebuild
+++ b/app-misc/vifm/vifm-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
diff --git a/app-misc/vifm/vifm-0.10.ebuild b/app-misc/vifm/vifm-0.10.ebuild
deleted file mode 100644
index 24a2c7f576dd..000000000000
--- a/app-misc/vifm/vifm-0.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vim-doc versionator xdg-utils
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS="AUTHORS FAQ NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
deleted file mode 100644
index 6d971785f150..000000000000
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vim-doc versionator xdg-utils
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-ncurses-linking.patch"
-)
-
-DOCS="AUTHORS FAQ NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index 6d796641bcf7..d38154118918 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,5 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1256 BLAKE2B 663b363de196b369935413efec92d76881365f044064852fc81bc36f2e605d8aa931e61c2219a27a05dac15748301e9d5c31870a576d2bdd4204302301eaddea SHA512 60318ace083a89c5d4fda06f72409c59a16db14f4ec9eb8a40f2d8750db5370e94342b4bffb6dd4a7d3187ea2b16ac3edfe2ae14c35eb5d2bb91b59ac639500c
+EBUILD vlock-2.2.3-r1.ebuild 1283 BLAKE2B 8af47ae476818dc62669643c0bea2495dd4867ab71f0254f13adc3c6f54becf33d723e5ac368c891dd750e0978a3b4124a8d80fc03462c30dcdc7e86e8f68a09 SHA512 84338752564c866d07653eabb9eea1ca369639c4e4e178a7895ea18bc0c9f6eb73fb9a4fa33a9a91fc0411c478843bddac254101510463ddd1f68b768691836f
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index 6773bbd88fc0..30ed7ba38f73 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!>=sys-apps/kbd-2.0.4-r1[pam]
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index dcbe9324867f..f2c862ae4e60 100644
--- a/app-misc/votrify/Manifest
+++ b/app-misc/votrify/Manifest
@@ -1,3 +1,3 @@
 DIST votrify-5.tar.gz 9192 BLAKE2B 5df0ccd0b5a843b384e002c2bd1001df06cb5bcf039f10c689abeda07f1a05c545a917b0a42bd78c06c537eacca58ef7b4c2920a0fe6809f4450d4c98ee2fade SHA512 3d441eb42f860e4e571541300a04c1a52a01abbe20f76615adc1c9764bafbff35faf0f1dbe9f9267ad3c4dc0e4cb4bc715b87e2104cdef8997e7918ab834bb5d
-EBUILD votrify-5.ebuild 1354 BLAKE2B be732a8b947c533bc57653b1d60e8d980ccf2fb6734a7201086e735ba53b8ab82017f04630b41e19ba773426129e760720100fde0b20e3fd2fdabf99078aef9d SHA512 aa0f0325d0c16cb6dcaad7bbf94c688c3789ed3008f1a9770097ce1e09598effc1c1c33b436ab56c8cda2acfc1291f270a39508be1dcdb65141bc653dd51a34a
+EBUILD votrify-5.ebuild 1356 BLAKE2B 3b96ed20e5d1f9734248ed988237806b21db6ba6aca895c9d5e1a0d870f1f4342c756c7d1435eb4e6d60a62d2ecfb8e303af338678169c510977c93f774f8450 SHA512 8860c82806034508fbc17eeb3f8412a532840f5ac6fefa2f479cf0b5b009e5746b5b38e7147b11392c0ca9561d4c2e717037e94664a5767eb7d6dfdcfdcbaf0c
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/votrify/votrify-5.ebuild b/app-misc/votrify/votrify-5.ebuild
index 179f0affaf98..9715317888eb 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit python-single-r1
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 8d61f3a432b8..3d818334119c 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2765 BLAKE2B 6ec931d380d74aa444a0919cf87659e222735ba717256cec88523174071077e0f3e51cd042a7e59365a1e24bd1b31df048417f631d90cfe32097e0bcb80b0856 SHA512 d60084718539d24e71d705ce0fbad9eee7eb3355b694b670b2ebdefa42db06336b88fb3ee84821c8bf1899fcaa716ce86b549f6e7849d2e5ed13333a3455ec22
+EBUILD workrave-1.10.20.ebuild 2792 BLAKE2B 38a746dc8ade6376cb0c8f15c737a6126ce1da27e141e1fe471f9831f4b8449d615756ad7df4534f93c2536afd353dbae0acd23985102c044b75161441ecfb53 SHA512 543b2237e60650ef24ca5531a9899e09568f8fb2493cf9ea4ff9ea6d5d514e81b76d1326c65e66b6523dd9c0c4ad0951885a9d3c3f876d65fdec42d4a420402f
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index 3b1fa627e946..a05c5f7aaf93 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ KEYWORDS="amd64 ~ppc x86"
 
 # dbus support looks to be used only for trying to use panel applets on gnome3!
 IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 031d61b55623..f1837edc4b89 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -7,4 +7,4 @@ DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f732
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 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
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/xmind/metadata.xml b/app-misc/xmind/metadata.xml
index 8c8ef6e93c28..7a38bb900964 100644
--- a/app-misc/xmind/metadata.xml
+++ b/app-misc/xmind/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index a0b0a370c900..22741a16367b 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -5,5 +5,6 @@ DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595
 EBUILD yq-2.7.1-r1.ebuild 1040 BLAKE2B 80231ec21baf9658fe95f86480247de9e52d593f0feff7293527579660c2e4058c273705c7f208536d53eb1ad1233caafc48ccad6a16dc8c9631b0567fc7003b SHA512 dd87aefcabf4e64e8422031c12faa8d32777f54f96354cff6f637d14636809884109797c04ed2753a9ecfacbe77509a8dcc1abef5b53ee582f02b7f0cbb425cc
 EBUILD yq-2.7.2.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
 EBUILD yq-2.8.0.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
+EBUILD yq-2.9.2-r1.ebuild 1077 BLAKE2B 14ceac5acdca2c7816ae1c0d11d4be974e26430ae71b1daff5099bb529aa4bf9fabac42e956854abece6c804d8d9945978c31f241bbc00e847996586587d4e51 SHA512 e8748cb120758b074bdb9d798e4e5860d2f538ea8370a7fa6f23f380b0809317713083f0e65b30f4c54b6fbc8f819074d539dc02de4efeb06497c217adedbc06
 EBUILD yq-2.9.2.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.9.2-r1.ebuild b/app-misc/yq/yq-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..b365f59085cb
--- /dev/null
+++ b/app-misc/yq/yq-2.9.2-r1.ebuild
@@ -0,0 +1,40 @@
+# 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,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+
+	sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index a366bf654a22..e979758d5c10 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,5 +1,7 @@
 AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe12ebf96e49cf28018e51e6c4c31cab0b8e18af60ffbb814c747de2293b3c270dacb03d556bdfb6a2a1c3752f SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a
 AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
 DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
+DIST ytree-2.00.tar.gz 124654 BLAKE2B db55a463c3103a544ce882da9e5297a9bde3d6e5b618332cf863dec87e6d1842197c5f6ae282e05d4a0674a8c8d52807f9eb2c163e87c1adf0b8c484e1874d62 SHA512 4306ac6f46187dafd48103348fc30cafd8cec50a196a526249c15528604ad635b0bbf96897fedcb69360b43000d0447698523168589aa917a5884252fa183529
 EBUILD ytree-1.99_p2.ebuild 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
+EBUILD ytree-2.00.ebuild 617 BLAKE2B 656e5b1c91754b3bd8ef7623f00396e5c084f5d48f2330536c95cc4fe8a1f53dfe7f7b9322d2d7aaab6e9d10d464509e3df229b1aef0d469ac43050de376e29e SHA512 f98140497eacb460b43ed9d9c0c55ebca2500552fd7203504cd703d47f1ac873891abb82fe03039210e06040bd165f6214bdeeed1be112ad95b9c161190ac2b4
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/ytree-2.00.ebuild b/app-misc/ytree/ytree-2.00.ebuild
new file mode 100644
index 000000000000..b914efb10d8a
--- /dev/null
+++ b/app-misc/ytree/ytree-2.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.99-tinfo.patch"
+)
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-misc
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)