gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-misc
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
177 files changed, 863 insertions, 2202 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b4a090b2789a..d55b71512a14 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 809119548bad..2806d3cccb63 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 736 BLAKE2B e62cefedba2de6d65158d83716b3ab3e82d1fe465f90c75e2708e82ba8e0b7f46352bea5b197f394dea12a1cbb656ae4a2cf5e0fb78b88e273b0406b3c1415a7 SHA512 a2b407972bff15ed3a04fa237e6415afdffd2e694fbe2a9290d930a6c4ae6647a4aa22e5b07384d4f36390b527135d1d769df1a9d3363b669bc21c87e4191a80
+EBUILD asciinema-2.0.2.ebuild 738 BLAKE2B 4d8991184d0dd57e1638b341e261c2b2c3ee951c048031b8960335d543dfa47e731c71159ed36da06b97522fed3de0538d2c6a740c2a7ba7a0f8b020bd16482e SHA512 cbd50a0c9e8426d2f18a7c8c188916bbf1df8ec8139406dba9ad948d43e38e02f7d35032494bb4348e02d204b5ae3ba96c8cf82b2d6cd0168b82e81142cfef96
 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 ff9eafcc5799..0cd5811c1933 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 8b1f92056bd6..1e7276d1e123 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -2,5 +2,5 @@ AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa
 DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
 DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
 EBUILD banner-1.3.3.ebuild 482 BLAKE2B 32e35eea88537f8debc7d9da68315444f2574ece0057444fd552fc9ff4712b82634f56b8f1c2b22380bcea80ab680e9339b890d024717b695586ef78e33bb355 SHA512 5a472bad37e23953e956c2cee7e2bb927d031dfd09101f651c9e73b912ef3277db1eb917c2ded63b6f1610814e5b7da15d12189509fda3910063d263119312d3
-EBUILD banner-1.3.4.ebuild 449 BLAKE2B a3acb21e40fe10d1ef42b8b80e1130fb3527d2046df38de755ee015838f67c714ff688591620e51779d2920cfa84a23fd62ac3624c7958b48a9d259e296f14d5 SHA512 d5c842567cbf1c9c71b9328c3c2ff81bfa4237b8cb700a94e500a051c0ed4f5a382be201384dd15058452e25a0074a17758ff69a3dbc67f2f8b77e088cb2228d
+EBUILD banner-1.3.4.ebuild 465 BLAKE2B e92722257e58e40f51b81c532f87b3d1ee54ae3d47960a99b9af43009c73d66e76ca76158bd19082be45905f750404f799c0d5cc85165beeebaf6f12098d160f SHA512 df7059756b4944436d444cea7e04bd9bda43bae7d68c33238455cad4327506df3039b95a25d717bb16635c736103fefacdfe7d05b312240f6d11662198569a49
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.4.ebuild b/app-misc/banner/banner-1.3.4.ebuild
index 86982445e08b..7d0c2a55625e 100644
--- a/app-misc/banner/banner-1.3.4.ebuild
+++ b/app-misc/banner/banner-1.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="The well known banner program for Linux"
 HOMEPAGE="http://cedar-solutions.com/"
-SRC_URI="${HOMEPAGE}ftp/software/${P}.tar.gz"
+SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 0c9fda53d305..445dad5f1351 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-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 1023 BLAKE2B bbf22b018156463324ae5fc95643aa29a989f972ce8eec284a1572bc04c14ac38cb899c3f769742f57a10be0d46ef639c44aa5cd406c5370611d856559499707 SHA512 cbc7343453e07bb6f9d775f2f4e59f9758a9c94270ea9fbbf486e93b876b3f6cbae3b8f973f0ef27be5a17cdfe9eaddcee0197a9d3a4ff83e9525fd3623ab6e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.26.2.ebuild b/app-misc/bijiben/bijiben-3.26.2.ebuild
deleted file mode 100644
index bece6e188913..000000000000
--- a/app-misc/bijiben/bijiben-3.26.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gtk+-3.11.4:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	>=net-libs/webkit-gtk-2.10.0:4
-	net-libs/gnome-online-accounts:=
-	dev-libs/libxml2:2
-	app-misc/tracker:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 0cfc188e6ae7..ec6fcbb6526f 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -2,7 +2,7 @@ AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B
 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-2.2.0.ebuild 1149 BLAKE2B 8d3b192341c37ab923e3cc5068e3ac98ffdde2dbed5c406eba2c1d05e20b239a4ef9f866b30b64fae37415ba279e7ed8c511367f3e76f8f1851c201a9c9c0103 SHA512 3b8088e56752a6f9481026a3fa376ef301ba91e9c8a4d4bb99e930401d45ccd84c58f467c7d148f191d0064a3d22cec2cf21bc86303f59143492248ce1893505
-EBUILD binwalk-9999.ebuild 1149 BLAKE2B 8d3b192341c37ab923e3cc5068e3ac98ffdde2dbed5c406eba2c1d05e20b239a4ef9f866b30b64fae37415ba279e7ed8c511367f3e76f8f1851c201a9c9c0103 SHA512 3b8088e56752a6f9481026a3fa376ef301ba91e9c8a4d4bb99e930401d45ccd84c58f467c7d148f191d0064a3d22cec2cf21bc86303f59143492248ce1893505
+EBUILD binwalk-2.1.1.ebuild 1105 BLAKE2B 810f421a527e168f2e5d7a1ad38ea2d346be92cdfb8e46915abf985eab5cd819c49c1907bc773e712c0c3c2276247dd4b09b6ed966079b514c82bf420bffd627 SHA512 86910ce3c0ba3d84115c4cac71ff30278363f154acafb853f8a287a9f4984d1b19abbb4893ed1cd2cb9f31b6124a8ec027595befb5ccf776050cee477ed331c4
+EBUILD binwalk-2.2.0.ebuild 1152 BLAKE2B 4b327f6a372cc90b57562c158f0cd008b0add282f59ce5c2101ae0740ffdb70a477a3b099fec7b1b08547e8da925ed337a05c78ca4396743ce5a5c9645ff9923 SHA512 851a849fabe3a6c9630516e5a8bbf2944f9ed053ce8d5f7f57b5af15e3329d23c91ce6a07b7d3fa4ba5e3550617dbf747f20b509c00f56dc63734e9aee4fb129
+EBUILD binwalk-9999.ebuild 1145 BLAKE2B be219cb66e1a38eecea0cb03af5d0053467a27e4ba46d23a4f4f5235cd7793c030f262a5955b06f5de0ed0fe03a4681b636c794af84a46ea9e5bf8f8d79e0b3c SHA512 dbb2411fae6747456b7268948f599ab2bf8edbbdbc1a6587816980df49746a3f2bdcb3729fd0342af0c8134cbc12a800ac0d1c53feabfde2356337acb0c71bba
 MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 8fa53b9dd95d..1f95a18eceae 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index cd3986d63469..6d9a4b269905 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index cd3986d63469..c05abc9b71dc 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 25f39dcc0fdb..5c8c8c1cbfc1 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -2,8 +2,10 @@ DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c
 DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
 DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
 DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b93323e6f422067a4be0dfe28ee8332db481d99bb1000aa48d384efca33f76e5e42d7d1b795f527e95a17119936966cc SHA512 a555e2084863ac604c3a511e11339a65059058af454eeeeb24993c5e432b42527382d3b1d308996a732e190157dbc6f003d11bd5a611cd59799fdfbb3f9a5fe4
+DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
 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 953 BLAKE2B 3893b4509dc2bff9352a6b7020f8c8561b13d4943a6ab8a95547f039273cf3ce6cec1084a7a2eedae7ccd52840c926b528eea2cf46d6aa5c67953f91574d33fa SHA512 d68d1733611739bb6d76524619d7dbbc9d8935d1f53bcdd3e88a3d10b4755621bf78df6640659db9e6729edd7773c7809dce5fe451fd326c72ed68c547cfce9e
+EBUILD byobu-5.130.ebuild 949 BLAKE2B e1ea4e9574d0b5288326c75f4bf1c834c300f04440d28fc018a72d5bb4c997d6f11b9254f5d1b0b17c5140776224cf0cd5bc3441d897c6c1cf6718997f364a97 SHA512 abb25ef5a65f87abd90bdec6257e461e98f1ddc8a26fa0ea4b3d1f1213000d45e0c6a9b6a050094290c598a4de234187efab0f5e185bd5b21bde3c82a694daee
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.130.ebuild b/app-misc/byobu/byobu-5.130.ebuild
new file mode 100644
index 000000000000..9a6ddebbb407
--- /dev/null
+++ b/app-misc/byobu/byobu-5.130.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 4b61ac4becc2..e9c833f625a7 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,5 +2,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5779 BLAKE2B 5b811fbfd9467e17c057f395245290db3dfb34cce16664df4d4a8f9c33f04e0435f67c917381a0c77c744e1284db22e304811732f9524b573f476ea2c9125181 SHA512 d367423cefbfa4b12ef0de708feba36e9d9b984aacdee2ffaae50347097b442a2e06d2ff2627d2ad3aab6fa3c613edfd4a0b50fa48de6a984e5173be1ef52822
+EBUILD ca-certificates-20190110.3.43.ebuild 5777 BLAKE2B 5e11560a645c94d6ed9a93a122e1c5a568e497cfdd17c41965b8f4ddd5ac5ae8f10ec426e700abebe26d562386566b94a20f193a0ed815d3c127b444665dab09 SHA512 2e72531dc37ad9580894c25967d303319d82c2379aeeec0b3d518f137e1151058cafbc835a0e21a0070a745da4d888f9ec9ef408c3de1895bc6cf4e89ad3962d
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index d08a568b2e9d..20736459a2ad 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/cargo-license/Manifest b/app-misc/cargo-license/Manifest
index 147a7875796a..7c9760c087dd 100644
--- a/app-misc/cargo-license/Manifest
+++ b/app-misc/cargo-license/Manifest
@@ -46,5 +46,5 @@ DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64
 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
+EBUILD cargo-license-0.3.0.ebuild 1291 BLAKE2B 6c4691af7a29cb26251cb2b607858255f3ec0112f25f3939bf162b0e57a317302b43af609903e473604e55fec8a869218878756cebb246b121e7f56c0ebb3d78 SHA512 5aaa87e7de487a68699d9a7ff98fe676b69f54b441afc5695f2bb8d170c410956f498f5b851df4cccbd9a4cf11aed70180616751cef0e0afb7a2e82ac6d2c43a
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-misc/cargo-license/cargo-license-0.3.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
index d140a5b79970..751230f47281 100644
--- a/app-misc/cargo-license/cargo-license-0.3.0.ebuild
+++ b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
@@ -62,13 +62,13 @@ DESCRIPTION="Cargo subcommand to see license of dependencies"
 HOMEPAGE="https://github.com/onur/cargo-license"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="MIT" # Update to proper Gentoo format
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 QA_FLAGS_IGNORED="/usr/bin/cargo-license"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/app-misc/cdargs/Manifest b/app-misc/cdargs/Manifest
index d4d59806bbf6..aa17b1c9a552 100644
--- a/app-misc/cdargs/Manifest
+++ b/app-misc/cdargs/Manifest
@@ -2,5 +2,5 @@ AUX 50cdargs-gentoo.el 270 BLAKE2B d39eb5ffd0e910aae99706b6e802621180a090d6ee221
 AUX cdargs-1.35-format_security.patch 4482 BLAKE2B bf7eb8cde3061bee105ca5f16fafa65fa43a0f600f80998e4d0e4244e277f4a0c557fade1a3a384642a75494a5cf1f94d4b678bb2d3322c128cf995eda495213 SHA512 379d220d9d257af5e260a4234653520d08078c2a89d30216f9d6c1b77e6aa18ff82d1c609203ceebd78ba238077acf0eda34d2a1e00fb059db6ba7a9fedfe3ff
 AUX cdargs-1.35-tinfo.patch 624 BLAKE2B 82a3210fbed0fd4f5903ef621a330e8eb01a9169e29cb2c09784c135581c5d08969c26b14e48797a27a3d73390371c8931ca00e1418de8bf01ccf5215435f50f SHA512 3f332d2f76c71affa92ab30b527621dafae09655b71839598784498fb7b07e5967907d6977bb2321ea7043a9c82d6dc2273c3bb5bf0fa7a8d4b11635442640b6
 DIST cdargs-1.35.tar.gz 74103 BLAKE2B 06fa5b4ed7c00dbcceeda28c2b02dd46431748434a692f3690885dc1141764e8aacef2e09cab57cf1baab32cb66c5c39a846a09fd6381723f47cd8dc98c8584f SHA512 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c
-EBUILD cdargs-1.35-r2.ebuild 1519 BLAKE2B 9ed71d63a460f16fbef8b137c695ad6a1e2af472982dc3951d9c842086e43fefc5f65508e1380c2c673aa4cad3e191755310556f817bfd94fd679e7d67c5af83 SHA512 39e329484f66651c34b3f2e45e33c1b657f89d2f150b8ae5136636cc807bea8350571b82bbe45f1853cc1b99b32d4513c46a28cae724f942c5d43929a0b4cc26
+EBUILD cdargs-1.35-r2.ebuild 1529 BLAKE2B 4d593f0c0bc9de436d93fd37e2a39eefe9c93ce849b496b599d4fa14b92397bb89576610066e1a5266e4d718b5a8f0ad7dd10528d9c120058a8754ed8e3f77cd SHA512 6456d40c8b2a5a85785a0f7dca210879d4c964e873bfe2ab91ba3a0da94ac96d241b0a87859405abdeca7a3432ad9f63c3569937315a23676065f9fb25745579
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild
index 28fca19b1a63..c1a76560ba1f 100644
--- a/app-misc/cdargs/cdargs-1.35-r2.ebuild
+++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="emacs"
 
 DEPEND="
 	sys-libs/ncurses:0=
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE=50${PN}-gentoo.el
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
index 49d738ed18d9..64b157cea7d7 100644
--- a/app-misc/chkcrontab/Manifest
+++ b/app-misc/chkcrontab/Manifest
@@ -1,5 +1,3 @@
-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 548 BLAKE2B b2c584e4f18c7f9eb1cbf014f64f94955db3dd4c4680917c22ce176f9fac6bf99cff7f68074a5437d52176ade5c336f5c748a59e4b1d561594a444b8b65c1944 SHA512 7c27ca8f5b5f30ae93a95fdc68836d2002e766e0390e2e7a076cd28d1cd2f29a9723eea8a35f9157df900a64340c3a9157d37f6a200d2da22295abce5cb9ac63
-EBUILD chkcrontab-1.7.ebuild 559 BLAKE2B c2d5be5a8970988899a757ea8bc27ea87a88e41918f59e01369b09611452aa279fbca4020d56fc0dc14efe1a4d9a112d4c89fed23f4b1d0b77beab4c7a3da215 SHA512 42fad005cc9e4d43963a399512d161af8862491568b08ba5644f7dc53a852856974bcd249a43ca95a3d5ca549d58ec58d505f2e905352618e41429f370735bf8
+EBUILD chkcrontab-1.7.ebuild 555 BLAKE2B 9a979397db300333f7bc3a29c3b172464e599af5a0007677d3687722e981ba969f6847bffd1b55b71ea2edb9a421409d9708120e0232cb0d931b587d26148d55 SHA512 64a948af488857b650fbb9bc82ac3a4be7c6862e80f514343a575d0352e693489450e2e2fcd79e09f62db37d85c9e3dbe6fb88f0cdb5669700b6d027d9de144d
 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
deleted file mode 100644
index 3ba987e07fac..000000000000
--- a/app-misc/chkcrontab/chkcrontab-1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to detect crontab errors"
-HOMEPAGE="https://github.com/lyda/chkcrontab"
-SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/app-misc/chkcrontab/chkcrontab-1.7.ebuild b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
index 2c96fd2b7630..03c12e27e973 100644
--- a/app-misc/chkcrontab/chkcrontab-1.7.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 9d46df4fc290..278214c855c1 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 977 BLAKE2B 80f5b040dde266aae12e8978d890d387d352e4abe01557c9789ead3325fa5d96d140bff00ea08d28ed949130ee7b78c9113fa5811930ed297442b63cd732e06c SHA512 7b8f5e733b250f2c13802b60b745612cabc4e757b19ccd6aa3aa3956f413bc079288115f3eb1f2b0758134998f5d730bb8762b04e571f0b8daff35a9d11a2f6d
+EBUILD datefudge-1.22.ebuild 976 BLAKE2B 2378144ecf8ca51493f777bebd0f15a798cb37aad7e9bc329465f7d1ae138672b1c71c477e36747fb1a1bbc44877ca2fd4b1d82f1f414108093286cddc2d0844 SHA512 c2b0bdfabf8e2d30f939be8b98bd1e2af7106ef7086196f0b8d66fa58e65284142c95cd405f17a56857e20027368bf53a9fe07077749511a996e9b4f0f4697b1
 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 02c2bffefd61..f7408d7a331d 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -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/datovka/Manifest b/app-misc/datovka/Manifest
index 1716d90f661f..63f1c439cb94 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,5 +1,7 @@
 DIST datovka-4.11.1.tar.xz 2583660 BLAKE2B 2d62e79c5be9d20e79d19bba43ce3d7fa8dd0b80e8bee6e63d04e63f6c878b84185b869fed1fc601f97350b499aa60041585693081e78bad5e0bc7e272aabcea SHA512 b36211b8830beb1f3a01b399303a1f2f87c77418975b007dac4b55613bdf54205eda0e7bac44d6c68e1102842eaa4231baaa46c31b99d5b6b145597f6a1366f9
 DIST datovka-4.13.1.tar.xz 2749936 BLAKE2B 7f713837e40ea9de170d5a009179ef89eafc4191d7fbdedf547c6d3ba3fbd273c279e381876f48f457e5b9abf01fa4830adb0eaa2077768ce43f5718e00f125b SHA512 94623c0befe9096396083162a1fb26ac53510a47e5305c4bdea65bc65e3af096847508ba2028d0089f39a0812700506818759e2e22c354fecf96a117745aefce
+DIST datovka-4.14.1.tar.xz 2798160 BLAKE2B 03f205840c81c12229d470c90c256d686728cc9c91feeb818af4c2ca914964b480003d9217302566eb902d4163b7035341ffbf0d1c7b3f524b7ae14eb45ab015 SHA512 0581680aef0165adc9c94a0b1270d3f4991a5ca3418996d9d8014541d5140aecb7f50d55cc057caafc28873713689d6c361a769dada86f48390f33ae093b46ea
 EBUILD datovka-4.11.1.ebuild 1081 BLAKE2B 69ca380374ee6c0ef333c6c5e7e32561ec146b63a638437601ff7645fd84f931c4a96f94ce88d45111719ab9dc6e07e351227fc483f8e3a3e78333ff3edc29b0 SHA512 b92315ef9f550f7aa923159b81ec2dd1265ff0769d2fdde689c990e23920d317dea9a35dbddde2892e22a8536ddc2cd848375c82bb187c559ef76a210408abec
 EBUILD datovka-4.13.1.ebuild 1091 BLAKE2B 17b68a7bd61d9f0dcc8d3e36adeb819013dd3722a273ac552611d315cc7a7ff912a6667a5446d892f1c3e34c29bf874f2a457e63179936710435f485b7758292 SHA512 fb2a614590eea9396ece25a80e0330ebc4a30a96e458bae8c487080d8d41d0e549cfb4cd49d776fd20b59e3f351c0e6b62eba234c9163337302535f3d8c5ef42
+EBUILD datovka-4.14.1.ebuild 1089 BLAKE2B 81ccddba27bab8a8d76bc7d6d0d5dda2ae9d90402892fda094ad57507cae0bb339aa0930f89bc58b27a9e6ed86053f90b7697b5f411ee1fcbd86eab34be93a90 SHA512 1299e25af3d7ba738d9704e598cc13b342285b1cabe390b4156d229b93ca6ea912bb374a256b21d957afc373563158adbc1be08edc13e42f6c0463533a0c948f
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.14.1.ebuild b/app-misc/datovka/datovka-4.14.1.ebuild
new file mode 100644
index 000000000000..92d8b525450c
--- /dev/null
+++ b/app-misc/datovka/datovka-4.14.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="GUI to access the Czech data box e-government system"
+HOMEPAGE="https://www.datovka.cz/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=net-libs/libisds-0.11
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	lrelease datovka.pro || die
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index 81354bff4b80..2356f2ccae4a 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -1,5 +1,5 @@
 AUX delay-1.6-headers.patch 156 BLAKE2B fa056fbf65029060d1d5291d78be65b8821d5fe4ef5f2e2b09abddd4dc0e28f35de97e8d7a01651c8c7eacc810cb093730b9a1ac81d0e784c26ebf0828ff6527 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1
 AUX delay-1.6-tinfo.patch 352 BLAKE2B 9ca59090f3d6483201a8133b204fc5948f7584285050787737a2cb23444ceff6d223fa1eb7c6a6d5712b95dc457c080efe930f041d1d03e55e3a393c27cfc484 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2
 DIST delay-1.6.tar.gz 69860 BLAKE2B f1823ff114279987c6ff2e7bb15634b27f0875fede7f879dfd69f6efee7f08f76f06673ad66853ea2e1e257174dde267455f92aadf2395dd5dd5aa731590aa51 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43
-EBUILD delay-1.6-r2.ebuild 681 BLAKE2B e40515bbe5ef3029db371ef80a62301ab3e854dac139991c1a940508c3e7efdd926420e0152186f700913a6c6210a9afd25378ca0f50c49a994cd6b522367500 SHA512 2943be99b7b01283b3e227085c8dfe4b4a8a853597ab60a050a48ca2885085699cad2e7df682516d753ae6293d70e9ee63a1bea003fd30fddd545348db1c9ab7
+EBUILD delay-1.6-r2.ebuild 687 BLAKE2B e2b42a69f43561e398738e58fca0cccdca93499fc6d2491d688b43613810fe71c42072d09b7074ce0d8f084c024d1e85c4d7166f533c79945b245f7511402cc3 SHA512 d6a07daf0cdddf136846874ea39034770e6839543b3ba19a0cdb432d66daf19ebc66a17e3bcd4f5020a332bfd842d7bfa1890f9cb87634f1428ed3588a671653
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
index 4527341b6595..68548f2918cb 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 63d754c52720..e9884ca68fde 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -16,15 +16,18 @@ DIST elasticsearch-6.8.4.tar.gz 148628251 BLAKE2B 09f7a18a1ee6f40154f2181bf354c1
 DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
 DIST elasticsearch-7.3.2-no-jdk-linux-x86_64.tar.gz 140098396 BLAKE2B bb2eb1e69b459533ed785f244ebbdf06032f8115f298e4151164fa27c913c6cff674dc8e75d96734185ffe47c2dd16dff11f3f7447a21bd0020fd45e58abf5d4 SHA512 9d73f6fce0b5321099393c69b1ba8544f9fc919f5a850bac3eb5a77af50f392e8eeb20ff34ba85283649a19d9bee33351a4ffd363cda848d4d53cde91632e335
 DIST elasticsearch-7.4.1-no-jdk-linux-x86_64.tar.gz 140407217 BLAKE2B 5bf378d66a199de45375e9e07e650e9cdd8fbdd8868c8a81928571be4aaf2d2b1bacf6cde8e216a98b448d1d6ef0db89b2b410d5b2d0bd5e0b40309b7e68f7e6 SHA512 7714a0bd8a69bf921075b2020863469e9d44896e73b383ca073cb243eadd29dc9a76936530c33304fb2e8505dfdc88b7591ddca9543ee1cf11e74df3bebd5b25
+DIST elasticsearch-7.5.1-no-jdk-linux-x86_64.tar.gz 141737287 BLAKE2B 2a32f0574023a10b3657cd9f9d2f5544f0191405bafba58e41d2d5ba953d6f546273a44c8bd7d9b4cd1122518312471f7b276588c513557bafbb0a40e4b91f55 SHA512 7b5f49b2ea4edd0f5289a28e4015322cb4549493c02d707f3b74fe0bc7f415dc1cdfeeb16a7129bb8b4e60e7e8b2694d6b6498919653ae8fd7baa10891d29a98
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
 DIST elasticsearch-oss-6.8.4.tar.gz 68444348 BLAKE2B 812180686f1082607c4c75679d591cb2d3517d16212c29b8f81b5792a2331b8faa5245540e1acea998b385eca6e4b06419c172b5d520913b8b31842dddcc4757 SHA512 d55ebb56bd13dbccf633f51a5d8cf5b0eee7d1e8954fe106e44286d5498dcffdcdf98117b42d8601ec987699a25d88a27dce7fdedd4612efd52bc18c561dc5ca
 DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
 DIST elasticsearch-oss-7.3.2-no-jdk-linux-x86_64.tar.gz 69289138 BLAKE2B 2ab3658a2acf1899f44fb29252932862759dd134ffe4872daac15092f9a08b536492197b9cd44287ec48a7aaee1c3f78edf2957f807aaebac866bc835972a592 SHA512 abb183a05db25a877d4e5a8f8b75fba517444008f34e35e82806a6239c3ccec1c32dc787313b899be55caefdab8343a62db31f9491bffbabefaecccaba1210d0
 DIST elasticsearch-oss-7.4.1-no-jdk-linux-x86_64.tar.gz 68527811 BLAKE2B d8965b429d4ee9b7becdb0ff407ac1ae03322a5c17ab7e793569fdd4ebffa302d95772e7ba0f4ae505fd07b62c2e6983d57db9feec7fd4da42676166287b460b SHA512 a652905b130ace0097b5f51df1d2ef5977d0eda8b551acaf7b3d7015397b054f83a868874fdc96b95e2c780c65552001ee2a90cb7b9f88f43b5ea813d0b078dd
+DIST elasticsearch-oss-7.5.1-no-jdk-linux-x86_64.tar.gz 68713211 BLAKE2B 67d7b1e60c3f38d0de55aaed6bd6ef37dd64b4c288fbd695974b33b7565197861c4bfcaee7476251cda7683021d6adb1ab6b6f67e2c2b6b91f29e1b4d4bb39d5 SHA512 26ea962f6fcb8ead1d05fc91e30ec10193849a4fb8b826753d591a249b04deb4dd3705f73dc6fa41334112a01b76babfa15e5fe706033dd4eb55638defc3455f
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.4.ebuild 2539 BLAKE2B bbf97b9bfd59a523d6a15a1ce94b5143faf011ebfb62e89d07424bb56bef16f172d3770516d7b170d7469d67f0b3462251778c60621f3472fe3d966bddc3f778 SHA512 dcd7a9909aee6c957e53154e34308e0df6ca3f7b02d815a9df7ea861fbe8753dbba46bd32c63c819dbb13f194eba909058ba18b7e3a6a6cce24cb1e50b2d9b70
 EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
 EBUILD elasticsearch-7.3.2.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
 EBUILD elasticsearch-7.4.1.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
+EBUILD elasticsearch-7.5.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.5.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.5.1.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.5.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index ed82c5cd9d54..958be223e2f6 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -4,10 +4,10 @@ DIST gcalcli-3.3.2.tar.gz 1674569 BLAKE2B c141bdba5a337ebc4ecc81f845c66281ad3d5b
 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
 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.2.ebuild 771 BLAKE2B e4b3332ded640174ead07262bef4339e927eef1d00cce37d782d30a70e33f0faa4da5d11ee73bb0c4e9335fed49315e3b3e0481d779d825a78d8db37f9baeea0 SHA512 8d5312d90a6bcb742fb13d2ad2ce0977e87ca6fac781378196bb418c350f46ec7a677b326d20b339374ca93ae6dc22f9af1c3c5c2402a899a5075ede029fbd3c
+EBUILD gcalcli-3.3.2.ebuild 771 BLAKE2B e4b3332ded640174ead07262bef4339e927eef1d00cce37d782d30a70e33f0faa4da5d11ee73bb0c4e9335fed49315e3b3e0481d779d825a78d8db37f9baeea0 SHA512 8d5312d90a6bcb742fb13d2ad2ce0977e87ca6fac781378196bb418c350f46ec7a677b326d20b339374ca93ae6dc22f9af1c3c5c2402a899a5075ede029fbd3c
 EBUILD gcalcli-3.4.0.ebuild 957 BLAKE2B e711b0dfcf53ea457cd43946e2808ace36afb7806f8eae00ca556450f6ba3542ed6c7ccbaf0b1ab3626d49605dcbf36bb36a8fde44e80774a35a1d357e82d052 SHA512 105df2dfa0d1962616c650d05c901b2b8d6f63d2b799eb5f1a08fb062f7555e5c0f67b150cba95a2cfbc473fbe7b0b182054165a94a5042e1cc74275c45298b2
 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.0.0_alpha3.ebuild 828 BLAKE2B 19dff43e187e6c9a776e78a27dff913140996243f766a40fde4710779bce97f838c563202d89aac13a68745e5cd1d892ddbe22fc826c8c618a496ad0c50b7bb2 SHA512 cc4c35ecd2f36deabd334d1300ff11e648752142a745b2005f3acd6d9cc9e6aeed702c60d1e521f87376f8ac652d48229164b053568628b4870fe195e1634384
 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 3460c4917c67..9d7904b49960 100644
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-r1
 
diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
index 3460c4917c67..9d7904b49960 100644
--- a/app-misc/gcalcli/gcalcli-3.3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-r1
 
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
index f2d5ab94edcd..fac4a749a287 100644
--- a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-r1 versionator
 
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 1920646579ed..299bb0d7e502 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,8 +1,9 @@
-AUX geneweb-6.08-parallellbuild.patch 1264 BLAKE2B fa7e9a94705ce2bf439888b2e64f889a69e29b6897c46e40f4d86c3d6d56d2fc9ab2790b0514b7e52dce93c0774fe3f006d889f3ed4a02342e8694c4e8b95a7d SHA512 2912f591f0c771b9bc039871416bd74364fe4a0c17200ea191033a3d12c4de4e088ddd24829ef07acb918e0f8be91671112ae7ebe0593b96a66945b6c18ecedf
+AUX geneweb-6.08-parallellbuild.patch 3166 BLAKE2B 3dd6874e194947f98be325ba0125f5d7a91798e9262e7fea2df434277c2300c1e96df70c463d166750c6fad9f6f43b2aa9735b6934f7718328fbd77a1311f9e8 SHA512 baa9790ea22e6c4f29c8fd496228296fee178a78b2539a37cda69750d7a20d0921722893343084efebe3fc3f3f84403e0db8e068fd4e8bdc49f5c81c2f25f907
 AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-EBUILD geneweb-6.08-r1.ebuild 1991 BLAKE2B ad17604b4d304e1a63def7cebf64929a7d2a0a66016bceba6cfbc525f7fd22b8722a3c84ea3343f1beab41fdd096727be400a2e4efb09e2d8d18559921ac3333 SHA512 be0dd494ea93438056e55a0b92e37cbeb99b5fda6cc4d3cb60eafe0aff140f6f1122f8f9ea61f76a3aa4a43fadbea17975929ea1cac77daf6f1cc3dae2721200
+EBUILD geneweb-6.08-r1.ebuild 1958 BLAKE2B 70ac814ce345ac8e26461c82551323f56d8331644977454f704a774f9b84ad76560ec2f6943c16271cf81cef4925f616d8125f26557714436b77a815c51e2c38 SHA512 2b992d10ea2307d2b2bb68b28133844874bfe8481427b549d8e404f84f5ea4b2ed8dc35d158af656b113ca8787babf1f0c2d126c95216c1662deb7f71b4de951
+EBUILD geneweb-6.08-r2.ebuild 1944 BLAKE2B 709302e66b2cc8a5efbdac4acde6181ccdc9525b1f6287f44044763d3eb3ca4f3885c66971ddddeb7ebba7371690ef64ee38ca03149403998b77567a59bb107f SHA512 89ce86e780688601e1e82d44cf58a83f99ff4f43956f19489d3e404bdb98b3d6089997e926b6fa1d7dc2a5011a9d7c5958c012a4f0634893892ce2fbda7bc417
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
index 71cfab667fc1..552660102eaf 100644
--- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -1,5 +1,5 @@
---- geneweb-6.08/wserver/Makefile.old	2017-01-09 21:15:00.328750224 +0100
-+++ geneweb-6.08/wserver/Makefile	2017-01-09 21:15:16.825751748 +0100
+--- a/wserver/Makefile	2017-01-09 21:15:00.328750224 +0100
++++ b/wserver/Makefile	2017-01-09 21:15:16.825751748 +0100
 @@ -11,6 +11,8 @@
  	camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
  	ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo
@@ -9,8 +9,8 @@
  depend:
  	TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
  
---- geneweb-6.08/src/.depend.old	2017-01-09 21:36:25.644868941 +0100
-+++ geneweb-6.08/src/.depend	2017-01-09 21:37:04.994872576 +0100
+--- a/src/.depend	2017-01-09 21:36:25.644868941 +0100
++++ b/src/.depend	2017-01-09 21:37:04.994872576 +0100
 @@ -39,7 +39,7 @@
  check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx
  compilation.cmo: def.cmi util.cmi
@@ -20,8 +20,21 @@
  consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi
  consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi
  consang.cmi: def.cmi gwdb.cmi
-@@ -311,7 +311,7 @@
-     num.cmi perso.cmi ../wserver/wserver.cmi
+@@ -162,7 +162,7 @@
+     mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx
+ history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
+     gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
+-    history_diff.cmi ../wserver/wserver.cmi history.cmi
++    history_diff.cmo ../wserver/wserver.cmi history.cmi
+ history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
+     gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
+     history_diff.cmx ../wserver/wserver.cmx history.cmi
+@@ -308,10 +308,10 @@
+     ../wserver/wserver.cmx
+ searchName.cmo: adef.cmi buff.cmo checkItem.cmi config.cmi date.cmi def.cmi \
+     gutil.cmi gwdb.cmi hutil.cmi mutil.cmi name.cmi util.cmi \
+-    num.cmi perso.cmi ../wserver/wserver.cmi
++    num.cmi perso.cmi ../wserver/wserver.cmi some.cmo
  searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \
      gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \
 -    num.cmx perso.cmx ../wserver/wserver.cmx
@@ -29,3 +42,23 @@
  secure.cmo: secure.cmi
  secure.cmx: secure.cmi
  select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi
+--- a/ged2gwb/.depend	2019-12-26 11:46:53.540446131 +0100
++++ b/ged2gwb/.depend	2019-12-26 11:48:08.833224914 +0100
+@@ -1,7 +1,7 @@
+ ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
+     ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
+     ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
+-    ../src/name.cmi ../src/secure.cmi ./utf8.cmi
++    ../src/name.cmi ../src/secure.cmi ./utf8.cmo
+ ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
+     ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
+     ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
+@@ -10,7 +10,7 @@
+     ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
+     ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
+     ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
+-    ../src/secure.cmi ./utf8.cmi
++    ../src/secure.cmi ./utf8.cmo
+ ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
+     ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
+     ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
index 692c89bf09ed..55528f558666 100644
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -17,8 +17,7 @@ RESTRICT="strip"
 
 RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}
-	!net-p2p/ghostwhitecrab"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${WORKDIR}"/${P}-ocaml-4.patch
@@ -59,8 +58,8 @@ src_install() {
 	doman man/*
 
 	# Install doc
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/{gwdiff,misc}
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
 
 	newinitd "${FILESDIR}/geneweb.initd" geneweb
 	newconfd "${FILESDIR}/geneweb.confd" geneweb
diff --git a/app-misc/geneweb/geneweb-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
new file mode 100644
index 000000000000..cab25ce06688
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneanet/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+	dev-ml/camlp5[ocamlopt?]
+	acct-user/geneweb
+	acct-group/geneweb"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-ocaml-4.patch
+	"${FILESDIR}"/${PF}-gentoo.patch
+	"${FILESDIR}"/${P}-parallellbuild.patch )
+
+src_compile() {
+	if use ocamlopt; then
+		emake
+	else
+		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
+		# If using bytecode we dont want to strip the binary as it would remove
+		# the bytecode and only leave ocamlrun...
+	fi
+}
+
+src_install() {
+	dodoc ICHANGES
+	emake new_distrib
+	emake wrappers
+	# Install doc
+	cd distribution
+	dodoc CHANGES.txt
+	# Install binaries
+	cd gw
+	dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
+	insinto /usr/lib/${PN}
+	doins -r gwtp_tmp/*
+	dodoc a.gwf
+	insinto /usr/share/${PN}
+	doins -r etc images lang setup gwd.arg only.txt
+
+	cd ../..
+
+	# Install binaries
+	dobin src/check_base
+	# Install manpages
+	doman man/*
+
+	# Install doc
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+
+	newinitd "${FILESDIR}/geneweb.initd" geneweb
+	newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+	einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
+	einfo "instructions on the README in that directory to use it"
+	einfo "For 64 bits architecture you need to rebuild the database"
+	einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
+	einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
+	einfo "(using the current package)"
+}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index e8ec9eb3b083..293b98684dee 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,7 +1,7 @@
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
-DIST gramps-5.0.2.tar.gz 16706686 BLAKE2B 006c8d10d574d7fe92b661400c257f6f1bc2b2e9e27d788ca761a5d51aa8593f9d26fdccdeeb0fb2860bfe1b08d937e938b3fb21094a42de0fb306d3c16dca49 SHA512 abbf885189bedcf9897bcb3216df86af41498c94b3b9c133350e84a8a61057ab4ed4823c3923823ec99fe0be92648e9259fdceaafd31f968c7d1560a0cd859da
 DIST gramps-5.1.1.tar.gz 17281131 BLAKE2B e729183832799a66547bb3958b4892c69359ec8e506766f4c64450f8bec3bf253460850f54388fa73659243cd96679c787fbbb9d645214682df26041c43b2c56 SHA512 fee7df5d2df2ae202c5e8ff4b941df4db6675925f6fce185c0fae709dd35ecfd6a1b81c8266d3f417f4949bed4e39f984a56917e74f56a3f3e499a4353927c37
-EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
-EBUILD gramps-5.0.2.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
-EBUILD gramps-5.1.1.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
-MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
+DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
+EBUILD gramps-5.0.1.ebuild 1986 BLAKE2B 0c49f29b06afe4abf8610c01adbcb62ee44f42f36b0e96a81ce1c4e9fb5c14be19b5a87eedd75501a7d0ed2276b7886861806de2ea071ca86f6e604e7671c45c SHA512 41796aa75d8808e1f7b679230925a43e35adddf41331068128482e87bbbcfde599fb83a1dda4fb197e38e3f74c2b7813574fb6157c0bcb32dbce8e08bdbc0349
+EBUILD gramps-5.1.1.ebuild 1988 BLAKE2B 9c02efe72a2cf6f0388e8818240a5cff16371c185d1d60444544e9b946d9f133628878039e4530a98af970cdb9f0c7a401ee93b0245b8ffc19fe5abb063faee9 SHA512 da02bab29f0719ec42c73c198b50a44e16dcf0dd9ea17d4985dddcb8c8d3e7930e421ff3bf5d7630d6efccd615b261275d0a08448aab333899138da5f9f79517
+EBUILD gramps-5.1.2.ebuild 1992 BLAKE2B e29411b6361370100e81376b913b6abfcb47bf1969ef5bd6c4737b46ec00e7c49c68401d8c250e708b22ad5821803e3cd02471e40b98dbfd2b140afd67725eb9 SHA512 78dba9ac2b6dadc2fc03029eb20570074dd0465189c8d190c12b21052e9cd0829c9b2ad63ac6e45b5d3930055131c8dc3d754613f7571a696c879d90a1fb29cb
+MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1.ebuild
index 858b7da41f7e..50a51f97b2cb 100644
--- a/app-misc/gramps/gramps-5.0.1.ebuild
+++ b/app-misc/gramps/gramps-5.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
diff --git a/app-misc/gramps/gramps-5.1.1.ebuild b/app-misc/gramps/gramps-5.1.1.ebuild
index 3ce0f03cb286..70d6bfc83f93 100644
--- a/app-misc/gramps/gramps-5.1.1.ebuild
+++ b/app-misc/gramps/gramps-5.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
diff --git a/app-misc/gramps/gramps-5.0.2.ebuild b/app-misc/gramps/gramps-5.1.2.ebuild
index 3ce0f03cb286..4d31c478eb8e 100644
--- a/app-misc/gramps/gramps-5.0.2.ebuild
+++ b/app-misc/gramps/gramps-5.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
@@ -50,7 +50,7 @@ python_configure_all() {
 }
 
 python_test_all() {
-	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# Gramps builds just fine out of tree but it confuses its test suite.
 	# The following might be an ugly hack but at least it lets the tests
 	# run properly until either I or upstream have come up with something
 	# better.
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
index 4398f3959769..676ea64bf000 100644
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@@ -6,69 +6,69 @@
 		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription lang="en">
-		GRAMPS helps you track your family tree. It allows you to store, edit,
-		and research genealogical data. GRAMPS attempts to provide all of the
+		Gramps helps you track your family tree. It allows you to store, edit,
+		and research genealogical data. Gramps attempts to provide all of the
 		common capabilities of other genealogical programs, but, more
 		importantly, to provide an additional capability of integration not
 		common to these programs. This is the ability to input any bits and
-		pieces of information directly into GRAMPS and rearrange/manipulate
+		pieces of information directly into Gramps and rearrange/manipulate
 		any/all data events in the entire data base (in any order or sequence)
 		to assist the user in doing research, analysis and correlation with
 		the potential of filling relationship gaps.
 	</longdescription>
 	<longdescription lang="cs">
-		GRAMPS Vám pomůže sledovat Váš rodokmen. Dovolí Vám využít počítač pro
+		Gramps Vám pomůže sledovat Váš rodokmen. Dovolí Vám využít počítač pro
 		ukládání, úpravy a zkoumání genealogických dat.
 
-		GRAMPS se snaží nabídnout všechny vlastnosti obvyklé u jiných
+		Gramps se snaží nabídnout všechny vlastnosti obvyklé u jiných
 		dostupných genealogických programů. Oproti nim však poskytuje další
 		možnosti integrace, které u těchto programů nejsou běžné. Je to
-		možnost vložit jakýkoli kus informace přímo do GRAMPS a
+		možnost vložit jakýkoli kus informace přímo do Gramps a
 		přeskupit/manipulovat jednotlivými/všemi událostmi v celé
 		databázi. Tím pomáhá badateli při výzkumu, analýze a korelacích s
 		potenciálem zaplnění mezer ve vztazích mezi subjekty.
 	</longdescription>
 	<longdescription lang="de">
-		GRAMPS hilft dir, deinen Familienstammbaum zurückzuverfolgen. Es
+		Gramps hilft dir, deinen Familienstammbaum zurückzuverfolgen. Es
 		erlaubt dir das Speichern, Bearbeiten, und Erforschen genealogischer
-		Daten mit deinem Computer. GRAMPS versucht alle möglichen Funktionen,
+		Daten mit deinem Computer. Gramps versucht alle möglichen Funktionen,
 		die andere genealogische Programme bieten einzubeziehen, aber noch
 		viel wichtiger, die Möglichkeit des einfachen Imports fremder Daten zu
 		bieten. Das ist die Fähigkeit jedes noch so kleine Detail direkt in
-		GRAMPS einzugeben und alle damit verbundenen Daten und Events in der
+		Gramps einzugeben und alle damit verbundenen Daten und Events in der
 		gesamten Datenbank neu zu ordnen oder zu manipulieren um die Arbeit
 		für den Benutzer zu erleichtern. So können jederzeit potentielle
 		Lücken in jeglichen Beziehungen gefüllt werden.
 	</longdescription>
 	<longdescription lang="fr">
-		GRAMPS vous aide à suivre votre lignée. Il vous permet de stocker,
+		Gramps vous aide à suivre votre lignée. Il vous permet de stocker,
 		éditer, ainsi que rechercher des données généalogiques avec votre
-		ordinateur. GRAMPS tente de fournir toutes les capacités communes aux
+		ordinateur. Gramps tente de fournir toutes les capacités communes aux
 		autres programmes généalogiques, mais, plus important, fournir des
 		capacités supplémentaires non communes à ces programmes. C'est la
 		capacité d'entrer toutes parties d'informations directement dans
-		GRAMPS et réarranger/manipuler quelques/toutes données événement dans
+		Gramps et réarranger/manipuler quelques/toutes données événement dans
 		la base de données (dans n'importe quel ordre ou séquence) pour
 		assiter l'utilisateur dans ses recherches, analyse et corrélation avec
 		les relations possibles.
 	</longdescription>
 	<longdescription lang="nl">
-		GRAMPS laat je toe je familiestamboom op te stellen. Het programma
+		Gramps laat je toe je familiestamboom op te stellen. Het programma
 		laat je toe om je genealogische gegevens op te slaan, te wijzigen en
-		genealogisch onderzoek te doen met je computer. GRAMPS probeert om
+		genealogisch onderzoek te doen met je computer. Gramps probeert om
 		bovenover de gebruikelijke mogelijkheden die andere genealogische
 		programma's bieden, een verdergaande integratiemogelijkheid te geven
 		die die andere programma's niet hebben. Je kan zo alle stukjes en
-		gedeelten van informatie rechtstreeks in GRAMPS invoeren en achteraf
+		gedeelten van informatie rechtstreeks in Gramps invoeren en achteraf
 		kan je dan deze gegevens bewerken/manipuleren. Dit kan je doen met het
 		volledige gegevensbestand( in gelijkwelke volgorde). Zo wordt de
 		gebruiker ondersteund in zijn onderzoeken biedt dit een hulp bij
 		analyse en de correlatie om zo relatieleemten te kunnen opvullen.
 	</longdescription>
 	<longdescription lang="pl">
-		GRAMPS pomaga Ci śledzić Twoje drzewo rodzinne. Pozwala Ci wprowadzać,
+		Gramps pomaga Ci śledzić Twoje drzewo rodzinne. Pozwala Ci wprowadzać,
 		edytować i analizować informacje genealogiczne za pomocą
-		komputera. GRAMPS próbuje zapewnić wszystkie wspólne cechy innych
+		komputera. Gramps próbuje zapewnić wszystkie wspólne cechy innych
 		programów genealogicznych, ale, co ważniejsze, dostarczyć Ci
 		możliwości w nich nie dostępne. Ma możliwość wprowadzenia każdej
 		informacji i wiadomości bezpośrednio do programu i późniejszą analizę
@@ -77,12 +77,12 @@
 		potencjalnych luk w relacjach w rodzinie.
 	</longdescription>
 	<longdescription lang="sl">
-		GRAMPS vam pomaga voditi svoj rodovnik. Z njim lahko shranjujete,
+		Gramps vam pomaga voditi svoj rodovnik. Z njim lahko shranjujete,
 		urejate in raziskujete rodoslovne podatke na svojem
-		računalniku. Pogram GRAMPS vključuje večino skupnih elementov drugih
+		računalniku. Pogram Gramps vključuje večino skupnih elementov drugih
 		rodoslovnih programov, poleg tega pa omogoča še funkcije, ki jih ti
 		programi običajno nimajo. Med njimi sta npr. možnost vnosa
-		kakršnegakoli podatka neposredno v GRAMPS ter preurejanje in
+		kakršnegakoli podatka neposredno v Gramps ter preurejanje in
 		spreminjanje vseh zapisov dogodkov v celotni bazi podatkov (ne glede
 		na vrstni red), kar vam bo v pomoč pri vaših raziskavah, analizah in
 		zapolnjevanju vrzeli v rodoslovnih podatkih.
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 034a2810afce..e9c7096b4f90 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,14 +1,3 @@
-AUX conf.configure 530 BLAKE2B 37d8b045c0938355f3c9d0f2150cb61c908fef06980252fdb32ee6ce1db9daf586631bff2578fb9f87aba8597c6238ec51a8f5821ed26b00a0f66d7cadc940dd SHA512 3db952ed800a959f5a69c52c0b1b2c36e3374547469fc437f82cc30271f813cf0ddec8719b4a20b4fedb3df411f9e526cef5cfec5823b663cce1ef8a2270955b
-AUX grc-1.4-ipv6.patch 408 BLAKE2B cf4abbae1b67b5390428e82d0e0053d2c3f828fbc22aeabed52fe2449cc6f11cf62d3aaf03846ed0d5255081ecb869992d5bf9fe0e879d75ff1947fbb2df1e39 SHA512 e84fe2b3de351ab24a86e97004b83e5494cde1147c447f3ed2cb354bdb7173180738c8b760efea780d71d536473904f97d9c04ff86c19e947b47ca1f963c0dc0
-AUX grc-1.4-support-more-files.patch 901 BLAKE2B a625da501d47451d5bda0e12f170af7df9f20d3d8848128cf9afa8013cffb9330aa2634c4243dc1a2e6d117d6ad4b2eea9cc9a3c4bc25b5983e53262b98e9e3b SHA512 0483c4d7adea1d813f62f7485845b470415f032726aae456fabab27486e26707931b70a12671b3e291528688e1546cb89d2cca7839b40cc2f365a6760d39edd7
-AUX grc-1.9-bash.patch 805 BLAKE2B f585f33bc8d04e8beecc54b36dab4db0bb4270ba388da93561e904696d9142749f2cc7dc48611f34919fddc4daaaf61e8603c8e4d8785b48d718c98c01858adc SHA512 75163dd8e5fc696a534291b09be0c18529ee3a7656886970ff60d65cd5fe6f3fd3bb3cd4f34237648b4fbd780482ec1b6bf496d806b8e0cd31334f33f59248f4
-AUX grc-1.9-configure.patch 1132 BLAKE2B ba7453be971fc34f5ed950415327a8192b539fad53e73012659feb4f10ddfa1b7562e76ad6c736bc9bb23ce78dc29e1080c90735529d08fbdaa050653c03673e SHA512 ddbda30c650418a6900f072aa45dc45b2162d9c20c94dcef212b44e0a7f70d169f8eccd2200ca60b4be711b2e367ad5e8e2fa7f9ed4d041b34387370ac872d17
-AUX grc-1.9-domain-match.patch 613 BLAKE2B b61bdcab166d180051e18e7ce26553faf809e7cbcbfe3a5241e322f0ba5b1f5e0743a9341d678bc5c6b418acf845f55c54da58d57bb2f42e96d20db975cc97f1 SHA512 1427c000d0401abc7dff052759c07cdc460c11ee10acb2994c414f269a94ef209ce1aa20a1717f2be7e95af9f2d1bd16ed0303906a135cb1c8fcbaa54c0558c0
-AUX grc-1.9-python3.patch 1124 BLAKE2B 2f7f6348aa9199124ee01763b1bfde93bbe69a5a441161df468230c4c09a869ea2c0725b560bdcf57d83fc7b47941e3bff6fcda72eadd327bac563a09b396d14 SHA512 275f45634f7d15eea8c359cf5850421ac0b057da987f053717da5ef15b82e4613051ab12f84e78ee809e71bd55382532b73d3731cdf4a10421c2e7622a236a3a
 DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
-DIST grc-1.9.tar.gz 29252 BLAKE2B f74c44e7166ba9dae7ccd90ef241c01d56cf860001dca81873c0078c1702c780dd49ce7ed03774a36aa1e4564d39f2a90932aadb8b20d8ed2f0741aae831d154 SHA512 947f4b61a8d4061e99d64e25a7b5ca2bcd042580b537ea07ea6ca609d7b81b1976b301de6036be2c199c7fa25c3f32d41a887f811ad72a1a18dd63d284e61050
-DIST grc_1.5.tar.gz 26363 BLAKE2B a4345b509581141b4fa8aeeaaf3a851b021c9314e2173e3a5485105f20182a2ecff8d0829537b24d1c972520cc78837d8050f7e9e0a6e615789b227ec964ccc3 SHA512 6b95a8db5df0d99b49052deb086ac02b180810ce754c744e145e3e0508562fb632e7fdb38ec4ad039f6e998c4122b065ba53925d73268c589475e36c16aa68d7
-EBUILD grc-1.11-r1.ebuild 1375 BLAKE2B 73134a81c973ab067fb1ab711e1a822a2655d085e7744ae43c11e37b618e6ff656e7ddb4f9196a899a0101d9902e2dbbeb918447d57f059c8273304484be2438 SHA512 e8df139f4c1deeeecc68a0a4da5bf2b3fee65f0bf07b87a7e3e5874b2d828a12b052c1f44f05e7b553e186a57488cf8a467bb7e1718de8d1a7c387e185e1d9b0
-EBUILD grc-1.5.ebuild 902 BLAKE2B 9e822a2eb28b034ed4e4cb4497de4991446e69042f3879c416d803b1131120b05f6caa8c7cd3a4c6350ab20705df60d90d73e045ac944e26425b62a708f3b035 SHA512 e144282e3bfe98e19c203144308da05f3478dfd1e55027d5479d76a889dd1d7bda0dbb77640b45431b6cf5e466a8ce72ae9823bf6c35cb524851dc90aeab2f6b
-EBUILD grc-1.9.ebuild 1293 BLAKE2B 9f1740cf38a8352697ed43a2e97a9124ee75e4c25c96c73d3bea3598615a4e075d518034e6033dffb535550994502fdabfaabbed9101b99931c3c10974c60282 SHA512 7b16d8d8b977944d1efd6f08f6295545ffce50bd3cad2e31adc3725771288fbbd70e13a5971a802bc6b403283639a02f173327b7ee424c5e1cb9f079f61485cc
+EBUILD grc-1.11-r1.ebuild 1366 BLAKE2B ea1e3f37203319e032e0e034aa563982297577b6fa0e494ef38e846b4b27fe8031aef317f0ee301dcc1ef1080ef424fd77167e599c111404612c42ced11d3f42 SHA512 6532aa32b9a58d0ba32d28fd48c4378c68279e14fd82cc9cd95ef00d9b9fac22bdfea5a7d444b75ab48d457bc2f040f7e105ae30071a41c7f26dcb0881bbc2d4
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/files/conf.configure b/app-misc/grc/files/conf.configure
deleted file mode 100644
index 8f26c601eba8..000000000000
--- a/app-misc/grc/files/conf.configure
+++ /dev/null
@@ -1,27 +0,0 @@
-# cache functions
-regexp=\b(loading|updating|creating) cache\b
-colours=yellow bold
-.........
-# checking
-regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
-colours=yellow
-.........
-# result is complex
-regexp=\.\.\. .*$
-colours=cyan
-.........
-# check succeeded
-regexp=\.\.\.( \(cached\))? yes$
-colours=blue bold
-.........
-# check did not succeed
-regexp=\.\.\.( \(cached\))? no$
-colours=magenta
-.........
-# ... should be normal
-regexp=\.\.\.
-colours=default
-.........
-# creating stuff
-regexp=\bcreating\b
-colours=green
diff --git a/app-misc/grc/files/grc-1.4-ipv6.patch b/app-misc/grc/files/grc-1.4-ipv6.patch
deleted file mode 100644
index 81945ea42618..000000000000
--- a/app-misc/grc/files/grc-1.4-ipv6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- conf.netstat | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf.netstat b/conf.netstat
-index 2dd96e3..ec2779b 100644
---- a/conf.netstat
-+++ b/conf.netstat
-@@ -19,7 +19,7 @@ regexp=^IPX.*[\dABCDEF]+:[\dABCDEF]+
- colours=green
- =======
- # protocols
--regexp=(^tcp|^udp|^unix|^IPX|STREAM|DGRAM)
-+regexp=(^tcp6|^tcp|^udp6|^udp|^unix|^IPX|STREAM|DGRAM)
- colours=bold blue
- =======
- # status
diff --git a/app-misc/grc/files/grc-1.4-support-more-files.patch b/app-misc/grc/files/grc-1.4-support-more-files.patch
deleted file mode 100644
index d90fe86bb16f..000000000000
--- a/app-misc/grc/files/grc-1.4-support-more-files.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- grc-1.4.orig/conf.gcc
-+++ grc-1.4/conf.gcc
-@@ -1,7 +1,7 @@
- # 
--regexp=\bgcc\b
--colours=yellow
--count=more
-+regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
-+colours=white bold
-+count=once
- .........
- # 
- regexp=^[^:\s]*?:\d+:
-@@ -15,6 +15,10 @@
- regexp=\`[A-Za-z0-9_():&*]+( const)?\'
- colours=magenta
- .........
-+# compilation method modifiers
-+regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
-+colours=yellow
-+.........
- # -O
- regexp=\-O\d 
- colours=green
-@@ -27,7 +31,7 @@
- # stderr to grcat 
- #
- # warning
--regexp=warning:.*
-+regexp=[Ww]arning[:\b]
- colours=white
- .........
- regexp=warning:
-@@ -35,7 +39,7 @@
- count=once
- .........
- # error
--regexp=error:.*
-+regexp=[Ee]rror[:\b]
- colours=bold white
- .........
- regexp=error:
---- grc-1.4.orig/grc.conf
-+++ grc-1.4/grc.conf
-@@ -19,7 +19,7 @@
- conf.traceroute
- 
- # gcc command
--(^|[/\w\.]+/)g?cc\s
-+(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
- conf.gcc
- 
- # make command
diff --git a/app-misc/grc/files/grc-1.9-bash.patch b/app-misc/grc/files/grc-1.9-bash.patch
deleted file mode 100644
index 5e1dcda299ee..000000000000
--- a/app-misc/grc/files/grc-1.9-bash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1d4f9e1ca5a27426da4dcbd3caee1e38b5d272aa Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 27 Dec 2016 13:17:27 +0000
-Subject: [PATCH] Use bash internal functionalities for grc detection
-
-which is an external tool, where as type is a bash internal funciton
-and always available
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- grc.bashrc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/grc.bashrc b/grc.bashrc
-index e9eba08..54e570d 100644
---- a/grc.bashrc
-+++ b/grc.bashrc
-@@ -1,6 +1,5 @@
--GRC=`which grc`
--if [ "$TERM" != dumb ] && [ -n "$GRC" ]
--then
-+GRC="$(type -p grc)"
-+if [ "$TERM" != dumb ] && [ -n "$GRC" ]; then
-     alias colourify="$GRC -es --colour=auto"
-     alias configure='colourify ./configure'
-     alias diff='colourify diff'
diff --git a/app-misc/grc/files/grc-1.9-configure.patch b/app-misc/grc/files/grc-1.9-configure.patch
deleted file mode 100644
index 66dc4ceda80d..000000000000
--- a/app-misc/grc/files/grc-1.9-configure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6d7ab5f6486c6d30a685605aa5b0ecfda0434e86 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 27 Dec 2016 17:32:48 +0000
-Subject: [PATCH] More advanced regex for configure colouring
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- conf.configure | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/conf.configure b/conf.configure
-index ac88ec7..e7b5d89 100644
---- a/conf.configure
-+++ b/conf.configure
-@@ -1,14 +1,27 @@
--regexp=^checking
-+# cache functions
-+regexp=\b(loading|updating|creating) cache\b
-+colours=yellow bold
-+.........
-+# checking
-+regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
- colours=bold blue
- .........
-+# result is complex
- regexp=\.\.\. .*$
- colours=bold yellow
- .........
--regexp=\.\.\. yes$
-+# check succeeded
-+regexp=\.\.\.( \(cached\))? yes$
- colours=bold cyan
- .........
--regexp=\.\.\. no$
-+# check did not succeed
-+regexp=\.\.\.( \(cached\))? no$
- colours=bold red
- .........
--regexp=\.\.\.[ ]
-+# ... should be normal
-+regexp=\.\.\.
- colours=default
-+.........
-+# creating stuff
-+regexp=\bcreating\b
-+colours=green
diff --git a/app-misc/grc/files/grc-1.9-domain-match.patch b/app-misc/grc/files/grc-1.9-domain-match.patch
deleted file mode 100644
index f00fecd7c67a..000000000000
--- a/app-misc/grc/files/grc-1.9-domain-match.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2e422109af7094d2787660f7841e7c2ab10bbcc8 Mon Sep 17 00:00:00 2001
-From: Pavel Vishnyakov <djhumster@gmail.com>
-Date: Thu, 17 Dec 2015 18:00:37 +0300
-Subject: [PATCH] Update conf.traceroute
-
-More correct way to match domains with any length.
-Can be checked her https://regex101.com/r/dI3jQ3/1
----
- conf.traceroute | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf.traceroute b/conf.traceroute
-index b6501a2..983a7cd 100644
---- a/conf.traceroute
-+++ b/conf.traceroute
-@@ -1,5 +1,5 @@
- # hostname
--regexp=\s\w+[\w\-\.]+\w+
-+regexp=\w+[\w\-\.]+\.[a-z]+
- colours=bold yellow
- count=once
- -
diff --git a/app-misc/grc/files/grc-1.9-python3.patch b/app-misc/grc/files/grc-1.9-python3.patch
deleted file mode 100644
index 9f4db14a2eec..000000000000
--- a/app-misc/grc/files/grc-1.9-python3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- grc   | 2 ++
- grcat | 8 +++-----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/grc b/grc
-index 56a53b4..19afe7c 100755
---- a/grc
-+++ b/grc
-@@ -1,5 +1,7 @@
- #! /usr/bin/python
- 
-+from __future__ import print_function
-+
- import os, re, string, sys, getopt, signal
- 
- def version():
-diff --git a/grcat b/grcat
-index a4e6dd9..16586e2 100755
---- a/grcat
-+++ b/grcat
-@@ -1,5 +1,7 @@
- #! /usr/bin/python
- 
-+from __future__ import print_function
-+
- import sys, os, string, re, signal, errno
- 
- #some default definitions
-@@ -140,11 +142,7 @@ while not is_last:
-     # do not try to understand the optimized form below :-)
-     if 'colours' in ll:
-         colstrings = list(
--                        map(
--                            lambda colgroup:
--                                ''.join(map(lambda x: get_colour(x), split(colgroup))),
--                                split(ll['colours'], ',')
--                            )
-+                        [''.join([get_colour(x) for x in split(colgroup)]) for colgroup in split(ll['colours'], ',')]
-                         )
-         ll['colours'] = colstrings
- 
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
index 07a205c82bff..7c2b4f3f43e8 100644
--- a/app-misc/grc/grc-1.11-r1.ebuild
+++ b/app-misc/grc/grc-1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils python-r1
 
diff --git a/app-misc/grc/grc-1.5.ebuild b/app-misc/grc/grc-1.5.ebuild
deleted file mode 100644
index b20233047ba5..000000000000
--- a/app-misc/grc/grc-1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit eutils python-r1
-
-DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.4-support-more-files.patch \
-		"${FILESDIR}"/${PN}-1.4-ipv6.patch
-}
-
-src_install() {
-	python_foreach_impl python_doscript grc grcat
-
-	insinto /usr/share/grc
-	doins conf.* "${FILESDIR}"/conf.*
-
-	insinto /etc
-	doins grc.conf
-
-	dodoc README INSTALL TODO debian/changelog CREDITS
-	doman grc.1 grcat.1
-}
diff --git a/app-misc/grc/grc-1.9.ebuild b/app-misc/grc/grc-1.9.ebuild
deleted file mode 100644
index 19693e78747d..000000000000
--- a/app-misc/grc/grc-1.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit eutils python-r1
-
-DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
-SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# https://github.com/garabik/grc/pull/44
-	"${FILESDIR}"/${PN}-1.4-support-more-files.patch
-	# https://github.com/garabik/grc/pull/43
-	"${FILESDIR}"/${PN}-1.4-ipv6.patch
-	# https://github.com/garabik/grc/pull/9
-	"${FILESDIR}"/${P}-domain-match.patch
-	# https://github.com/garabik/grc/pull/45
-	"${FILESDIR}"/${P}-python3.patch
-	# https://github.com/garabik/grc/pull/46
-	"${FILESDIR}"/${P}-bash.patch
-	# https://github.com/garabik/grc/pull/47
-	"${FILESDIR}"/${P}-configure.patch
-)
-
-src_install() {
-	python_foreach_impl python_doscript grc grcat
-
-	insinto /usr/share/grc
-	doins \
-		mrsmith/conf.* \
-		conf.* \
-		grc.bashrc
-
-	insinto /etc
-	doins grc.conf
-
-	dodoc README INSTALL TODO debian/changelog CREDITS Regexp.txt
-	doman *.1
-}
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index a3c3c48644d6..cb1c061db253 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -2,5 +2,5 @@ AUX 50gtypist-gentoo.el 182 BLAKE2B ae05de070f7c0dd0e0c6b31a4d9a8e9bab1b0f3d6a3f
 AUX gtypist-2.8.3-xemacs-compat.patch 592 BLAKE2B 23d8195c23c0e510b42c5b4ef9b466cfe13fc094990502615e49b28d97630758f4f7ba6f78dc84c941c2b481547eba423c96156cb909ed5fcb4bf1cd06404777 SHA512 6e85193a1354bc318f78382aaa24dea473d704ec347f8ae854b4a83985f2d4b1b8f64e59e3526b05bdd1e264de8fb8d4d6865bb296cf55f3896a56bfdc0930fb
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
-EBUILD gtypist-2.9.5.ebuild 1428 BLAKE2B 7d90949787de377bc61f4bca139b2af740de5260c0870331139a3cd7bef03daf5cb5abe4ad5b90ef85a10500a884f70624cb8ddbceb52411cf23a07cf6348c46 SHA512 c118f5a72fbe318220e963fff828a03013432fb79327e6fc39ec5a5492137eb984c4e2d3d4f6785aa65cfc8e4e137f5094a082f6344d0dd45cb69076b4665329
+EBUILD gtypist-2.9.5.ebuild 1438 BLAKE2B 6861db666ff2d8d57ff654cdb334273a3195a348152dcacec9a7a3319fcef9a9a7001bd4f3a37348a42b59d718d0f279da919db8c23448773a0ef40844c44aeb SHA512 fa3956e3d2e689e614b1bd9116c68f1c2c59bf1f8d12e550cc6206099a71a5a7c7bef2b23b58480b4e884859dab2eb848d7df65fe3e61c685f61b7a90d9c7e3f
 MISC metadata.xml 246 BLAKE2B 0bfcc7ff5b18e4794606074e7cfd25cdb14e1324dc50880490257fb94ade836ed7d04dc043fa026732c6eb4eeea9daf2b5e0112489c9fdb5959f718ec9e4839c SHA512 868f217ab39861a74e1e85a7920bb2c283cca35d231d4cd2c8e66a6d9ad81d5b03343701fd508ba13bc7c273e4d34678954005d2f58cbb147beb01ad3b7197ee
diff --git a/app-misc/gtypist/gtypist-2.9.5.ebuild b/app-misc/gtypist/gtypist-2.9.5.ebuild
index f15364a27288..0ecb2e7fd225 100644
--- a/app-misc/gtypist/gtypist-2.9.5.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="nls emacs xemacs"
 
 DEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
 "
 RDEPEND="${DEPEND}"
diff --git a/app-misc/hachoir-subfile/Manifest b/app-misc/hachoir-subfile/Manifest
deleted file mode 100644
index b108fb2491e9..000000000000
--- a/app-misc/hachoir-subfile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-subfile-0.5.3.tar.gz 15499 BLAKE2B a055f19285cdfa5a6d31b9f7a346b7ab54b8eb3c54d78890079bde25bf9660b5cadd18f9418b4dc55a543b329bbf38f274aa78fccddf52f47f9f65f28a0d4375 SHA512 b34cf7d7befc1031ae821dc5124b83d198cbd6d2f95666b8497b23a87c748d574637ed65023c7e1e2532a3a62ca079dfd13d11dbcac31457c6423309208d0ce4
-EBUILD hachoir-subfile-0.5.3-r1.ebuild 770 BLAKE2B 26d1ff2aed81b2957a51b8af0101618b81122878cc27d55eeda196238387037703f7bbafb34b355df88a1f7bbef212e3f13da471e0162434ca0dec37b20c96e6 SHA512 2a8f9c56de9d39584ec23cb5204c83454604a6c4e1a2e57f634d2404268e838117125aa8969561476270b0138c3f274689942635376200ab62166496cd18ccc4
-MISC metadata.xml 425 BLAKE2B 6636365b918a8252757c0a69ea4dad61a9ea1eefe45ad2b0864b33a72e41c9af358662550bb9e9bdb42c88d3c627d9c316192f45d78761bfc5ecab7c76e00cb9 SHA512 7c19037ce6003a18113d0ef240041a0ad9501080b5021a018124be678ee86240f6ad3cbb4fa0ece3a8a4994884eb499374f714b2ab2dd1e60ce82e885051af2d
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
deleted file mode 100644
index b2b40be21fef..000000000000
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Find subfile in any binary stream"
-HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/hachoir-core-1.1[${PYTHON_USEDEP}]
-	>=dev-python/hachoir-parser-1.1[${PYTHON_USEDEP}]
-	>=dev-python/hachoir-regex-1.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	mydistutilsargs=(
-		--setuptools
-	)
-}
diff --git a/app-misc/hachoir-subfile/metadata.xml b/app-misc/hachoir-subfile/metadata.xml
deleted file mode 100644
index 6fc0267d511b..000000000000
--- a/app-misc/hachoir-subfile/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">a tool based on hachoir-parser to find subfiles in any binary stream.</longdescription>
-  <upstream>
-    <remote-id type="pypi">hachoir-subfile</remote-id>
-    <remote-id type="bitbucket">haypo/hachoir</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 713382e173b9..c06695315d9c 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.14.ebuild 1863 BLAKE2B 35510e76779b4f922488bda280313a1d833c0194f1bb72faf6727d81e22156d525b3d545f9c9b6276d81fa6cb6cb82c7b633bb94f05df7c047a4901624cccd98 SHA512 685d24f06b3ab3c0e64550726f416a2d34355273e1c8a607524dfcf17db959abce3412b7ea94a3aed565a636a3d535dabfdc4061c63e76874a76a6b3ccf83f4b
+EBUILD hivex-1.3.14.ebuild 1859 BLAKE2B 0042949d8cf5c1bb481718ad45b57f7259d33d9726dd60e6f8a64c3e99f537b985371c26f285218f31efb00104fb2d9e2a0f373fc9bb62705dfb224a2595830f SHA512 f1d3c557ffca13131b6adbbe54e0fe9ce0c57513edaa7336268539400ab4b2f1940a2234c5cfd48e065388c9b39ee86c0049974fe4b3bd08a3afa19f62d80b60
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index b7386f5f5381..2e226ec0f396 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_OPTIONAL=yes
 
-PYTHON_COMPAT=(python2_7 python3_{5,6})
+PYTHON_COMPAT=(python2_7 python3_6)
 
 inherit eutils perl-module ruby-ng python-single-r1
 
diff --git a/app-misc/hodie/Manifest b/app-misc/hodie/Manifest
new file mode 100644
index 000000000000..f2029fad9483
--- /dev/null
+++ b/app-misc/hodie/Manifest
@@ -0,0 +1,3 @@
+DIST hodie-1.5.tar.gz 18450 BLAKE2B a3278a2f3ad0153606ce96d6a96981f80e2c4944c8a7baa33b438b7db9136be10f0bdfb0646c4e6f75e5ee2a2e21032d3c453e2fd6b5923f9b458b42e4186d5c SHA512 831e8e78f3353695f408b6f5602a8d8a0b633bd6df5d717b479d30d16989ddbbf426302e4d539d9babdc70c52a3ee3908bc0c8f24de4e437c475c0c2c5629289
+EBUILD hodie-1.5.ebuild 556 BLAKE2B 199f448d094fc99f2238e3f5f82ba0426af783cc4b1e2617a1fea4cc3e9298f4af78bdb14b31e0143ddc68c8c78a96d70705bb433702629e668023b0e9a70951 SHA512 bbb2803b4219f0780dfdc2eab64623a59b30124c33b14f8340aeda0f714fb3671c0fe9f4ceda72dd285f8ebf3f8d2a35df97a3805ca0070ef1ea0ca508b34dc0
+MISC metadata.xml 364 BLAKE2B 750fa4c9e1b40cda0dabeeab4175eed3792bc2edf122d37521278d7ad3b27da6b7593f2e05e804593957ae2612a27c517c6b730ca321a5adb8397071210331d6 SHA512 ec49ef9169296e47bf48aec935305acb4c83d526b3fd73b602d582b4478b86c2ab5f701a03ace79f0c1745755f845c047aeff1a8a49c582c339939c7bd0503a1
diff --git a/app-misc/hodie/hodie-1.5.ebuild b/app-misc/hodie/hodie-1.5.ebuild
new file mode 100644
index 000000000000..93f8f86f99a4
--- /dev/null
+++ b/app-misc/hodie/hodie-1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_COMMIT="5946cab2fab41c40b237a69e3aca08b1180cbc10"
+DESCRIPTION="a Latin date(1)"
+HOMEPAGE="http://hodie.sourceforge.net
+		https://github.com/michiexile/hodie"
+SRC_URI="https://github.com/michiexile/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	doman hodie.1
+}
diff --git a/app-misc/hodie/metadata.xml b/app-misc/hodie/metadata.xml
new file mode 100644
index 000000000000..8b8eb1b6e5cc
--- /dev/null
+++ b/app-misc/hodie/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@nephros.org</email>
+		<name>Peter Gantner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 26760c986f7e..d292475defd3 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,3 @@
-AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
-DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
-EBUILD icdiff-1.7.3.ebuild 611 BLAKE2B 8302be0e057cb611b6c5fc2805c2df0c93039bd5dc307278731aa06f085edd946ab1e40370343972e1668639e8fc18ae9b2308f7d7418e61e0265bfbfd568ea2 SHA512 89a72c65a2996ca15cea189d99f3e436359d6df13421e2ff84ae7e63704d12b6b5212f8801d802f03ba3b79b34ea9611b53d51bfc19707521f85c5e02f3d98a6
-EBUILD icdiff-1.9.1.ebuild 550 BLAKE2B 1f1a425779601dd9bd462d1aa6f4925ce7d02dabbcaf09a49f0dc961cdad253162e3c2ffcda47ed2eb80a4471a98ce48418055e96243995232b09fe833923ae1 SHA512 fd66e8d60c29b48e59ebb79dca52647366dab6d80be078e4edc4107ed1c957bbef6a6fc85a85c62b7212a67bd41298237355fe27c0353ce4ca194c9de2580ff1
+EBUILD icdiff-1.9.1.ebuild 546 BLAKE2B 98b7efcb1aa7410ca384ff85c4a4cbcdbd495d261a7682ccdc5b5da23b54ba4b6e1ab2b0c1bbf7056d18ae18ac7c82956d3ae5e9cf476413fce7608266f0fafd SHA512 0b79e2ad90ffbc085711b328d2c7b14a703ebff4272cd54dc91e3f5dff4fedf449a803dbfb4bd3da814395e0ab8cd4b5198c804a66d092bb4239bc4f3bb1ec51
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
deleted file mode 100644
index 1a9f0c957cd5..000000000000
--- a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/test.sh b/test.sh
-index 264c696..1bb7290 100755
---- a/test.sh
-+++ b/test.sh
-@@ -97,11 +97,6 @@ check_gold gold-67-wf.txt           tests/input-{6,7}.txt --cols=80 --whole-file
- check_gold gold-67-ln.txt           tests/input-{6,7}.txt --cols=80 --line-numbers
- check_gold gold-67-u3.txt           tests/input-{6,7}.txt --cols=80 -U 3
- 
--if [ $(./icdiff --version | awk '{print $NF}') != $(head -n 1 ChangeLog) ]; then
--  echo "Version mismatch between ChangeLog and icdiff source."
--  fail
--fi
--
- if ! $REGOLD; then
-   echo PASS
- fi
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
deleted file mode 100644
index 8d5e2ca1bb18..000000000000
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="https://www.jefftk.com/icdiff"
-SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
-)
-
-DOCS=(README.md ChangeLog)
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-	./test.sh "${EPYTHON%.*}" || die "Tests failed"
-}
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
index df0f0d0c61e2..687c0aaf44b5 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/imgurbash2/Manifest b/app-misc/imgurbash2/Manifest
index ad32e0e4a0fc..b8dfad524ee1 100644
--- a/app-misc/imgurbash2/Manifest
+++ b/app-misc/imgurbash2/Manifest
@@ -1,4 +1,4 @@
-DIST imgurbash2-2.1.tar.gz 3619 BLAKE2B 01bb37615184113082a87b79b5bbda1707e36d8f4a28715e0686eb63f8d7c55f7aa760ecab9ab2457c1601e9cb0ff4b558cd08f8a77a123cfe97d8008ad1aa93 SHA512 32e7c39d3456f3d540af2db8b21d8a5724bf9b1db372953f3dd0ed21a6f7529209ec7afffe22410be46a99753202aca2454732d09c1314350187c5610b36ab9d
-EBUILD imgurbash2-2.1.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
+DIST imgurbash2-3.1.tar.gz 9257 BLAKE2B d7383a89f96387a5dfa9096ad533f334e9e15ec5de8803a4e2623379d036e7f0810166e017b8d89d228418bb035a5dabd1e6d0e305d539544efb1b5fd4ae8bed SHA512 0ec3b081dcd3da7a558c7895eafadc9c98f6b32c4aecb3ff579392599f785bf0716a80053b743ab32fe4e1a9f7253c9c08acf3d6f1c65d2a4c40d4c7ac222e59
+EBUILD imgurbash2-3.1.ebuild 601 BLAKE2B 89ebc31aab052a83a482e669867a07d557ceb709d7bba03b6186e8fcd9a93ab7b369a8cd630c92f4e89c8bc513f8ba88a92103a3d4017d407f9e4a7cc27b0e3a SHA512 0d80a0b34a8f5414918e383a4e732ca1441afd367dc40ecb99ba6c81cee64cff49ef24f3bbc419bb0d10a8850995d34f420bfb34bd991d9eaf3b583fe2e66a37
 EBUILD imgurbash2-9999.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
 MISC metadata.xml 446 BLAKE2B d320d9d38032271643c158fa8bd5e356c41a2fa3d91c375eb58a42084f2d202a3728a4b49e2826111bf01de57c5e451b82be8cd8c11ce40f4ab86a41981839d7 SHA512 f5d5aa394eac1885bc1aec85009b73bce9f875ede01719a234a84d8a311441e372288abf04d993263828b0bdabee6da1ab81c7ebd70f1100f5c4c17a0ca6e1de
diff --git a/app-misc/imgurbash2/imgurbash2-2.1.ebuild b/app-misc/imgurbash2/imgurbash2-3.1.ebuild
index 076690d530e5..c4ebb79aed2d 100644
--- a/app-misc/imgurbash2/imgurbash2-2.1.ebuild
+++ b/app-misc/imgurbash2/imgurbash2-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 5f0666362aa2..9e327474e88e 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -3,9 +3,9 @@ DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce0238
 DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf80760234df00241d9eaaced3bcf37bb8b4bb282c39491f69c9ad6fea0f89af3836c29e23294356847bb88fce645b8 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180
 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 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
+EBUILD khal-0.10.1-r1.ebuild 1264 BLAKE2B a59615939e8a7ffcfec1fac21b93cfece6a5375c7620750b26f1b4d4daec2d08a557c56f387e7b84c5d393c734766a8751e4f67d60dc701de07eceb065112537 SHA512 695583d16532841a04df14f4f22410a3f61ca07eb5dd99bd2403b5f3a0c20ddc745d5df2cf0ac473a29cec48ca92a7b9bfa9a4bb20d7d8222da60b431016b5d7
+EBUILD khal-0.9.10.ebuild 1216 BLAKE2B 368d898fdab658268309d486dbf00e081fb52ddcb78224b43c710526e34faec98e3ae92bdf049b240dec6207496e82ce742d3f5dcaaf284916a10fb066451be7 SHA512 9f71b2c9eb0557be1fd20fc1215bf6300a6a30ff0c7beb48fba84e66079ce3f4fda9fb8965d7ac1afb409f56d0fbbe3f154d2f5d2774014ade5370e4bc4313ed
+EBUILD khal-0.9.7.ebuild 1198 BLAKE2B 1295eac16ce431bda6789af02682b1648cb4a86edebf865001c6edb33a9b57570dead6cfe61827c65d2e0ecdf5f1cbbc1255260e0610ff45435257ec204b1d43 SHA512 8966c3842729adbe518ff5c270fd4955c08996d86489099abb18af8819265a5f8b777ba4decf34d871fba6dec6bd04c677040cc8e00c0da294bc5134fe975171
+EBUILD khal-0.9.8.ebuild 1197 BLAKE2B a1dbf3d29d39b8d6c2e8dbcf9989744628ab66ad2365031ba51c2206b6e5a7c10590499646e7baaf4db8949610b106d9ad8188c72d5b8f624b50727938a4b8a1 SHA512 38ac68165976c0607fc13ca575a50d68c38f9fba42fe9dfcf4f34a08082c7675517c05c12c14e3c7789b87a4ca340236f25212e3f6ff93b6e380ef45667e413e
+EBUILD khal-0.9.9-r1.ebuild 1214 BLAKE2B 9dd34a47d414644871025175c7f37b4e5ee3b71e5195b5cda456004162a7513e93f0ed7bde79aee6287c9141a4788fa4a32acb73885183d4cc1a3ef839d595fc SHA512 9c29e98eb5df300c51785f450b8181a7630b11e2de0cfae7f72a25fd74e49e436589d4de3895ef8908156e25bb0978b66d1c2772152ae3e144d1276220975e1a
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.10.1-r1.ebuild b/app-misc/khal/khal-0.10.1-r1.ebuild
index ce7106ea0df8..4ac5f62001cb 100644
--- a/app-misc/khal/khal-0.10.1-r1.ebuild
+++ b/app-misc/khal/khal-0.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.10.ebuild b/app-misc/khal/khal-0.9.10.ebuild
index bb45d7fa8246..ab611970184e 100644
--- a/app-misc/khal/khal-0.9.10.ebuild
+++ b/app-misc/khal/khal-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ HOMEPAGE="http://lostpackets.de/khal/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/app-misc/khal/khal-0.9.7.ebuild b/app-misc/khal/khal-0.9.7.ebuild
index 6a7abbc82c06..099cbd824662 100644
--- a/app-misc/khal/khal-0.9.7.ebuild
+++ b/app-misc/khal/khal-0.9.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.8.ebuild b/app-misc/khal/khal-0.9.8.ebuild
index 56e145031c29..2df4105e2987 100644
--- a/app-misc/khal/khal-0.9.8.ebuild
+++ b/app-misc/khal/khal-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.9-r1.ebuild b/app-misc/khal/khal-0.9.9-r1.ebuild
index 40b70f884ac2..5b49eb16928e 100644
--- a/app-misc/khal/khal-0.9.9-r1.ebuild
+++ b/app-misc/khal/khal-0.9.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index dad89174d447..d5040fc50047 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,7 +1,7 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
-EBUILD khard-0.11.4.ebuild 1051 BLAKE2B 35281ee5be57a11f14c39972cd62d8905255fa7f3b80db159728f91f14f2f2b53fd2d8f2bdcedf95f75e54fe64cfd6bf56a53cbba7f60f615afcfcd3128286ff SHA512 fe89ba5e91eba423ad2c043032147d92bdefcb01e4ba4cd3d4ef6f5f246ecc070a9fea0a585759024f225e9cc42e61313fe246718deada83651c7b18bf439f7d
-EBUILD khard-0.12.2.ebuild 1092 BLAKE2B e9c01439843b829c52d2b88048064a066b0aa6755f1e566a37d15d7e709bf60697686529b23eb7f1778bb9288f8e58ad588cdab3cb4cf65480075c0906a41cce SHA512 21ad1929357ea9077e6946d757564d0fedc84d81781ed0251e1e940efb65121de27be5d14f140242fa910392158882cb397f3da8bb6a75c6128f96f3be80e771
-EBUILD khard-0.13.0.ebuild 1187 BLAKE2B a9c472360bfd317831ff628de145fd76dc3601d5df83890b60db3a6552995367778a4f2770f873d409be06b7e7445d9226ed0cf92704dfb016a6c90b03eeb632 SHA512 ab66470a74738dfaaeb41677f44223951df9855647a004355b34000cfd9b222cb98ae55bbd061583e9d38b2486285b029a1ec6af8e2a4b1fb9e2b9586ee77aad
+EBUILD khard-0.11.4.ebuild 1047 BLAKE2B 5a49a1924187a58ea0bf40b424d401ee0baae588df144cc5e108861f96de4cf46589a8c99ed52df38ec8c73060f8f23bfa46ee082aad7bf77df4b72d0211f025 SHA512 4eb9eab539505f09a209f0e85ee00f0279ef8ede395932db733e9edd1f647d271594c3a96add9a5879b399ab0201a4b763294ac5d757016dd75b373ced314583
+EBUILD khard-0.12.2.ebuild 1088 BLAKE2B 302dfb8248572c15237119721c0fab8ce08aea7932f60df758c4ea60d204a1e18e506362bd5ac986cb768a1fb99dc1ac230939d4ec266e1693c51c43f155f657 SHA512 bc1b6f651bdaa91d218744c8e36ce757cb3f0411e58b7bbbf625bf486d55d85f73bed6ced12357b3d6d0561d84fcbee60f6952cd73c8d1856b19b9971499cdc8
+EBUILD khard-0.13.0.ebuild 1183 BLAKE2B aa1ade1fc3037b8d9dbb0cb18d7dc6a4c1c00415b532d22fbec03475f3a6cdf671809e5b082698fbb77540267fcdc63014fc426babdbabf85c6f8466ea4d05f8 SHA512 e7ccd606d59b71ecfe6c0e82a54d9978097065d08c643d8f316d2ee168a7c53d456e5a9e85a6f32ab23c91daa01bc3dd20cfc55d7ef537811a8acfcdc666819c
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
index 27c5add5916a..f2d17514103f 100644
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
index 9ea3905df385..c66bad5ddb82 100644
--- a/app-misc/khard/khard-0.12.2.ebuild
+++ b/app-misc/khard/khard-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index 43c01300c2a6..dfeca48d35c3 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index c101ca1db09f..aba011f690cb 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 463 BLAKE2B 1727b8f72aa4075b61c62074b099c9f2f5f8f6976aa7ea2332ea1e62842d59c4d80d08d71d88b6e07c1953d7d4c9add15059f5c48c74d2b2cb53cf590a456a97 SHA512 39dd836502f9ada368271cdd780327679622b599d2a29ce1236926df50453a7926a7745e754d9ea77e906da7c6a7f6e759aead1f25e09738db1f53311018ff2e
+MISC metadata.xml 412 BLAKE2B 4a92b64039475119e84a4c9f11b1c6dac92d92139b195d37adcc710b274436a69b538d68b66393ef6f090338aa162d159929a498ba3b7d95dbcaad3b29d9204c SHA512 e8844f948a8f53b8b932311dd12c36b8148e985cb9f6927c384c131d914bd2dc42a240d45b98354a5cde3c6d6e4915c177ebed7c780c4f0b1f065571ac54ccda
diff --git a/app-misc/kryoflux-dtc/metadata.xml b/app-misc/kryoflux-dtc/metadata.xml
index f275c2365baf..9a18e02a6422 100644
--- a/app-misc/kryoflux-dtc/metadata.xml
+++ b/app-misc/kryoflux-dtc/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="demos">Install example floppy game files.</flag>
 		<flag name="fast-firmware">Install fast firmware instead of slow firmware.</flag>
-		<flag name="gui">Install the Kryoflux GUI</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 07c6f51014bb..151f2d9fc28a 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,4 +1,3 @@
-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 5561 BLAKE2B 2e2bb11514bd884f02649b6a620a9f4f92097a8d53bc04e1e9b594ea0022ee00de1facd1189c1d93b68edcb9677469c5cb6190fede0ce47eee9ec89ef199204c SHA512 8c2661960d0e099309b0f28f82c301e56accae7a85ef70edbb133fc4ad4c4be71b20b36cecb1f50a8ffcd680e8ff8f55e69ec201fa270dc9b22d08900c15606b
diff --git a/app-misc/lcd4linux/files/lcd4linux-r1.initd b/app-misc/lcd4linux/files/lcd4linux-r1.initd
deleted file mode 100644
index 44ca73e9aabe..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-r1.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "lcd4linux" ]; then
-	config="/etc/lcd4linux/lcd4linux.conf"
-	name="LCD4Linux"
-	pidfile="/run/lcd4linux.pid"
-else
-	config="/etc/lcd4linux/lcd4linux.${SVCNAME#lcd4linux.}.conf"
-	name="LCD4Linux (${SVCNAME#lcd4linux.})"
-	pidfile="/run/lcd4linux.${SVCNAME#lcd4linux.}.pid"
-fi
-
-command="/usr/bin/lcd4linux"
-command_args="-f ${config} -p ${pidfile}"
-command_background="true"
-command_group="root"
-command_user="root"
-
-start_pre() {
-	if [ ! -f "${config}" ]; then
-		eerror "Please create ${config} before starting LCD4Linux!"
-		return 1
-	else
-		checkpath -f -m 600 -o "${command_user}:${command_group}" -q "${config}"
-		return 0
-	fi
-}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 51342f5206e1..ae47c84b4e60 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,7 +8,7 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3740 BLAKE2B 094a39484b473f0a36d5ace14edecc3ac8e33a4fe7a5d739bd55f34a0aab83ec2ebed9abc0df51d50ef9f9affcfd1f7dd112449a7ec3b6941ebb949441050120 SHA512 e9e5f1bc6746ec2bb8cf11c3935ae480ab94603f7e97b0e7530c63d7560c34d281fc7117eb1e783e1c403d04de7e55503747798f9e4c0b96ed6b968d6656a8a7
-EBUILD lirc-0.10.1-r2.ebuild 3787 BLAKE2B f3be53c6caa978247c3b3cd2bcb4c40c319ca7ce359ec4682b469ac30b123a43fdbb08870db9c29e90a7ea7ac77cca21b8b3db6c644d2099de907067362bcccd SHA512 ed9617b3fb0f60095b1226ce1ce6bb788295bcd1ee042e0892e4b4b2b9ffd98bb2b7a71692af60bfccb8f47afd23141af43650968220189e050671c5de84a462
-EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
+EBUILD lirc-0.10.1-r1.ebuild 3738 BLAKE2B faecad30946682bae43b79958bf28a104c30ddd15ef16bfcddf2774e0071258152ff7bc8b63ddd4331aa2079f930f8474b2f59b7775501f57860db305f1160d2 SHA512 1c52edcbd2098e792b7b3d8c3e31d62b64548cf8b256ea63b5adf7781cfac79bb563b678a661f4cc5db898a172ba5330f26005267feb7ccfeeeea261b690995d
+EBUILD lirc-0.10.1-r2.ebuild 3785 BLAKE2B 64b727b5e693af133653912abd70ab6190857c5eced7f632ab4bbf1cf0516a1c8e717cb3175ecf2f4be41b1d07d5523218a397d44d21aaa9792f06cc4ef0a4e6 SHA512 263eef1f495adb0d98a315f6ea16b456b29d33d976ef5d5272a5afa2c56db736b3d9688426700ec414d8645d484609e8efc8883f86af10ad1fd8221256ef1900
+EBUILD lirc-0.10.1.ebuild 3724 BLAKE2B a6a2bfcc0ccc61b06dc0e9187c5b4d6f9e92d03e054e289b014997785d5de84c81cc926c41d6485eaace39e6693c9edb2e977470b2a6bd9e7669b1d6819c9f0f SHA512 f5f5d939a0554e95b4e8737522630913d047800754c5495313a2bed96487e7f70fb5467c84497ac63fb93e10011eea930fd0d931d41ec2d34a923f6e02366fee
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index 6a9261677694..af0e1339c581 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/lirc/lirc-0.10.1-r2.ebuild b/app-misc/lirc/lirc-0.10.1-r2.ebuild
index 1395b4dc65ef..8454fbe9244e 100644
--- a/app-misc/lirc/lirc-0.10.1-r2.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 60b8ec018130..ae37d7aea7ad 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 2b8eacaa3ba4..9311ca345182 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,3 @@
 DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
-EBUILD media-player-info-23.ebuild 1049 BLAKE2B 0284f6422873551711325cf62bc878ffb7f13acb58bfb208070b4ff5fa7b3c5211885b7e73e82c7fedc0fed2ab5b7651e9c1bc1c62967e789b42eb86e254ac55 SHA512 b519212e731925320c39e2118ca51b9b5a2877e0be3b87001a82b7178d2d39098c867b16415e9d4c8e5eeb6a9aaed8ee9565d85c3d8dbe9bd25e58a0e1affd18
+EBUILD media-player-info-23.ebuild 1045 BLAKE2B e5bfb2356174d00abc99652916c54b821d3c7ca66d8227e73ca59f292118baeb0a040a8da28ec8b761a17c9d80b6774fb8e211b60f23e239917ffdbf10bf4046 SHA512 e7fd923b41e0411e1bc68f6302caebf4ab3849c7daa77f40aa017d6f87ef63cea2ea5298e11469e4c9ab3b50622089c494203e10e9a5a43f080e306ee909f21d
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index f856d00a4b78..61e2ce19cd64 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit python-any-r1
 
 DESCRIPTION="A repository of data files describing media player capabilities"
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index acd6fd98c2c1..9447599b9ad5 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,7 @@
 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
+DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 EBUILD mosquitto-1.6.7.ebuild 2836 BLAKE2B 88fffcd2ad6d45a40f6da80acc6c3b97f7a464d155d92553d32522bc658ccb5ba03b81eb4041659916f96479907ac065f884784676b77b2851b5cf3acc774e7c SHA512 ddfb0b172bb77a87449b924033a6778d768651a2d9132b35ac45f13303c4e04456b0249cf60602d13bd381da13fc01a44f8778a966799e06d1b687fa8935b804
+EBUILD mosquitto-1.6.8.ebuild 2847 BLAKE2B 9cc3bb38c8f7a7d1cfb48540848a05218b70d309df346d267ea47c37092ccd49fb33d0ac04bd626053fa3074a9938c9d419e3c122f81b1615cc62b6b9b1d2681 SHA512 8c63fd6055b9968cb3199cbfb42de4b049128eac5a48108d6b3801d2160e18fc394323e0337c7cb7c920a3620b1ddabb8a58b512e7a546b49d76fa0f53ab4520
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
new file mode 100644
index 000000000000..25f2cf6d4c5e
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+	acct-user/mosquitto
+	acct-group/mosquitto
+	srv? ( net-dns/c-ares:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	test? ( dev-util/cunit )
+	websockets? ( net-libs/libwebsockets[lejp] )"
+
+_emake() {
+	local LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		CLIENT_LDFLAGS="${LDFLAGS}" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	# Remove failing tests
+	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
+		-e '/02-subpub-qos1-bad-pubrec.py/d' \
+		-e '/02-subpub-qos2-bad-puback-1.py/d' \
+		-e '/02-subpub-qos2-bad-puback-2.py/d' \
+		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
+		test/broker/Makefile || die
+	sed -i -e '/02-subscribe-qos1-async2.test/d' \
+		test/lib/Makefile || die
+
+	python_setup
+	python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The Python module has been moved out of mosquitto."
+		elog "See https://mosquitto.org/documentation/python/"
+	else
+		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+		elog ""
+		elog "    rc-update add mosquitto default"
+		elog "or"
+		elog "    systemctl enable mosquitto"
+	fi
+}
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index a78ba38f4328..5e993153923a 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,6 @@
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
 EBUILD neofetch-6.0.0.ebuild 637 BLAKE2B 5e6b83694bd417aefabc73221164f785bcb11de5bfc2865512349dad6c1c423aa9fdc49c805fb70a7ffd93ba08c41c116f028682a2515bb3cbfe6ea4c20d5ef6 SHA512 c2087360b880f6013e1a6a002a32665002318f06169ff6dbeb9907f62de0b76c81cb51f490f7ccb1bff2fd85a452cf064c23cac0db98d531dff9053d363d9765
-EBUILD neofetch-6.1.0.ebuild 639 BLAKE2B aae31bb81d6bd7cd14faf2a3134ca8d0ddfc2b3f877d85ebc353daaeae2d982f2c097da768d9ec05d01911a34802682a870f76afa25bfcd55f64d6d34c759e0e SHA512 0ef2a9662f623dfc910644827003d9f66442a5c0fbfe12b12ff12f3c4d09d67c7b226161df4ad137c0dfe658b9d407dc97a6caf5f5d0128420b08633c6f10157
-EBUILD neofetch-9999.ebuild 639 BLAKE2B aae31bb81d6bd7cd14faf2a3134ca8d0ddfc2b3f877d85ebc353daaeae2d982f2c097da768d9ec05d01911a34802682a870f76afa25bfcd55f64d6d34c759e0e SHA512 0ef2a9662f623dfc910644827003d9f66442a5c0fbfe12b12ff12f3c4d09d67c7b226161df4ad137c0dfe658b9d407dc97a6caf5f5d0128420b08633c6f10157
+EBUILD neofetch-6.1.0.ebuild 646 BLAKE2B 603f174c94fd590bf63b5ab99c112831924b838a6ca2be34bfc8bcc4da6d800ac5e0f683b07c9aa4d5a050f9d7adff962302e3cb712ae739d458e3c91eb45dad SHA512 901681cf1a38b097f9a3e18ba42a95068e0041cb19d77bb060cb48aa80fd89bfd914e5002974d79883b5d025dd07ec496af09c2604adf6f43ee333435766d54e
+EBUILD neofetch-9999.ebuild 646 BLAKE2B 603f174c94fd590bf63b5ab99c112831924b838a6ca2be34bfc8bcc4da6d800ac5e0f683b07c9aa4d5a050f9d7adff962302e3cb712ae739d458e3c91eb45dad SHA512 901681cf1a38b097f9a3e18ba42a95068e0041cb19d77bb060cb48aa80fd89bfd914e5002974d79883b5d025dd07ec496af09c2604adf6f43ee333435766d54e
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-6.1.0.ebuild b/app-misc/neofetch/neofetch-6.1.0.ebuild
index 2df09f60d624..f3ecd1b3aa6d 100644
--- a/app-misc/neofetch/neofetch-6.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86"
+	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 2df09f60d624..f3ecd1b3aa6d 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86"
+	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
index 66ea86d37d0f..ea3768582472 100644
--- a/app-misc/openastro-data/Manifest
+++ b/app-misc/openastro-data/Manifest
@@ -1,3 +1,3 @@
 DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af
-EBUILD openastro-data-1.8.ebuild 528 BLAKE2B 0c72c093df42370a0e3038dfde4f7cb605f435327a09e77393a497612ad35c25de22af866c3a4dffa61adae52462c2554961f68dd415299eb9283a8d20859c66 SHA512 17b3fa3b5bed016ceecd31cdbc82ab192143a234cad29c1b6f1e01cab63752a4e2bd6ada4c6d71cd608367eb0352fecf8aee300273893f0944f956ec5ba2d174
+EBUILD openastro-data-1.8.ebuild 518 BLAKE2B 5004459a594f497e8c5bfc18d5255f994d0f9b0ff715a14c0e10a87fb01dfe1977c14f7bbe086a9097945b3b259c82a17934f6afc540a18c45b70f92a2b25d0a SHA512 7bbb3a523cb8a2d37e4181cf6663953fbf4f6747e31ea43c9f15f61525dba4b1ca6c2b9f0d2d7f095a645f06b5227a01b1b0a274ec504a07f45c25d9085f6383
 MISC metadata.xml 391 BLAKE2B de44378c992fb6a7cc3fd16c2cec319b49dafc0da73f06e41ed08e48a57b97906f2e488bc2dc74d8850800762c3c70de3281af436dadf67d8a60b30226c795c3 SHA512 33213a04e12838729bdce8d1db7a395d337dbf65f9b00bdb3fac1f7a0764efd615a879942f03d9bec6476026d1fbc81e69a096bcd3831adada5b289bbbff483e
diff --git a/app-misc/openastro-data/openastro-data-1.8.ebuild b/app-misc/openastro-data/openastro-data-1.8.ebuild
index f864371491fa..b669c656131e 100644
--- a/app-misc/openastro-data/openastro-data-1.8.ebuild
+++ b/app-misc/openastro-data/openastro-data-1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
index 2951ced98cc2..2d3d32ed174c 100644
--- a/app-misc/openastro/Manifest
+++ b/app-misc/openastro/Manifest
@@ -1,3 +1,3 @@
 DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d
-EBUILD openastro-1.1.56.ebuild 921 BLAKE2B 965b2afe7217df4b226876052366c3f7613074aa5d7e7fa72ce5b466628a9987cb817b4d981b2c06d2c9c2fe93a088dbe7245ade2061681446339d4c31ee1938 SHA512 53961a5e1fd2b3e113cf1a5bf2d708fb0d4c4fad56927cae5b41e29a4586ff34ddd160f85897d4f42746d9b49f7d09d39c9ae88d11bb07e8d79d9abf377bc3bb
+EBUILD openastro-1.1.56.ebuild 911 BLAKE2B bfd6df62fa284a0d04c8a8823abb0a66f5357b0a36913ab29ec76aca47f14b9f5d8ca6579de4ba14d384e6c51bcb08aaac0b35ee50cae1f5ee1f9526d2887c94 SHA512 aa40565b142d86a7993de4ee148843baee6e61b431293711537f7133f0088c69746ddd628c4356cf4b3ff981a9e51aa741fc8ae996c780ff61b4596e7be3e846
 MISC metadata.xml 554 BLAKE2B b7e8a99695365047f82469d977834081f033f7742a56a376897455e1b87acbf305454088dc9102265747b67f327733a74386e2d0e04c2f8c6d521ad44bd40bee SHA512 4c226c8e6dc6effd387a8fd9af0c1f52b471e90c4fdca04d37b291fae787eaa7d390bca12c0a5095bc2a242ba32daf80005ac69ea48e3764a0685b1974c88301
diff --git a/app-misc/openastro/openastro-1.1.56.ebuild b/app-misc/openastro/openastro-1.1.56.ebuild
index 1338e8e212f3..ed85dc27bf73 100644
--- a/app-misc/openastro/openastro-1.1.56.ebuild
+++ b/app-misc/openastro/openastro-1.1.56.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 55560033907a..1191fdef16ed 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 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-r3.ebuild 1784 BLAKE2B 5047eef121278a753c477cff9f93c40fd5559aaa667bfc12408744eb2926a723bee8db2bf4a52c2846e22251a9cf9747b96a194897973849728206eaffb94675 SHA512 994945da1dfdcbb3c5a330ef34ad363776a9d2e0b80bdce1554fe97fe9520678f16e3e279b587563132e065fb5ef3f5685f0624da590735a2b01fdb8e80a2d46
 EBUILD pax-utils-1.2.3.ebuild 1455 BLAKE2B ab4d234e6513ea35fce6f8c6e57c4f8ff60dacaae4bbe03f5ab1b16a4bac139a7281559691d470285e6c0877b2d3058445fe5af2fb42ead23fc71ac7dbf9ef16 SHA512 d76be941d202b762d7d2adab5129dc95a25a1484d7f412dbde3c3b825ac75304fc3b1f3aa60b33dc0792d34b69e4a6d1ccc81ee9f839b4d77ff93d8a8d9cb258
-EBUILD pax-utils-1.2.4.ebuild 1738 BLAKE2B a54a79d9d5341aff4e4018a54dd0121b9a64982d5a6474f6681a286580926590a9270d8e095cdaa85ffb89e42549636a01cfb8f7276332658790f0fde06105ae SHA512 5ca94f122ec65a31d4daa356e8b1a569af3f4d77da472425aca29ed828bdf49e2914705147a198aa930d8e67f643fe2c41eadaedb937ba35425074e65853e06a
+EBUILD pax-utils-1.2.4.ebuild 1737 BLAKE2B ec003ef39f138afc07a6b02ec58cd44bd253c3131b03d32196580c848196aa4a318a3c817154d030845d27dbe9f371c8b38c0c353fd60097b8419645b70ee4ef SHA512 35904ea69012a08cd0d8dd28a0cfb56f181415f9883150c6378321eb719d956fff3972d7c037e9cbba12e529bc7c0f74f4fc83a41e1535158973fe27f9a1b555
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
index b80584839386..2f1358a19ef7 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
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 a834befc62ed..b4f02979653c 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
@@ -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/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index ef23857857bb..37a3898088a6 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,5 +1,5 @@
 DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
 DIST pdfpc-4.3.2.tar.gz 107504 BLAKE2B 5fe9ee096aab205365f93374b8ffe3990cf1aec818bcb36d2f35d572854348087f07f7e99df1c71dfc1b40c1c3c1e9e4e666a698020398416b59d151c74805d4 SHA512 e1e198c4cad996e7818dac10c07133e5c6cccf0333506eecb1090091b5c1de36f27e08178c648587e68816cc7e7d7f1666181c09a01780ea6d620c4c9820674d
 EBUILD pdfpc-4.3.0.ebuild 1013 BLAKE2B b9e65e5107ffe73c3b5b0695b1c212ba69d8c8862ec96155b5fb10bd83fcb3887076f429aa465a0ac31e1c1fce13e7b4fe487765d743cdfabb3b355290e63265 SHA512 1fb3bb7bd72df39347026613db652405dc074629a04284bab4165899b7a3a1d689c5f5429d84259c022021a079000f45bd3fa3c60b385b5189ef2bad308bf85b
-EBUILD pdfpc-4.3.2.ebuild 1040 BLAKE2B b6eb02ef0d0778c538111f6ae3d83c838f825a5df5ffc7c18944f4f5348bc3e0de843fe15306dbdd9529c9cfa4bdc83ad3ea971d1d79df7d0d87c4caa1db4d22 SHA512 cd4622a15da56d8c5dbe68f8523dbbd7e948eabeb34b0ef8c57fe41efbe1e52163e9f2b8c9d7b9042d4015c1724db2c19f61d80477841d949782429d8e4b8008
+EBUILD pdfpc-4.3.2.ebuild 1022 BLAKE2B 661ff4f35a41c69a5004f879fcde773c9b2e6fbef50e2fda739370b1d65ad7ebb37bc1ae858efc5d5839c7cbc81194c63c2d4c89508a65ccbfa36bfd9c929613 SHA512 ddbbadf09107a2bb3bae47437751790f5b934e15d83e4dfcd97ea68e9b9f257826e1ab46e6c16bbd11d865bd6ca0d2d32d41f911d0b85391c8f6557d47e5eca4
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-4.3.2.ebuild b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
index 8de1c1444c14..889c7715a7fb 100644
--- a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42" # fix sed line if you increase this
 
-inherit vala cmake-utils
+inherit vala cmake
 
 DESCRIPTION="Presenter console with multi-monitor support for PDF files"
 HOMEPAGE="https://pdfpc.github.io"
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="$(vala_depend)"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "s/valac/valac valac-0.42 valac-0.40 valac-0.36 valac-0.34/" cmake/vala/FindVala.cmake || die
 	vala_src_prepare
@@ -40,5 +40,5 @@ src_configure(){
 		-DSYSCONFDIR="${EPREFIX}/etc"
 		-DMOVIES=$(usex gstreamer on off)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index dc6cd57b95cf..702ced4bd4d0 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,4 +1,6 @@
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
-EBUILD ranger-1.9.2.ebuild 947 BLAKE2B 6d50ab935f2eaf291b92e2c8dce55b414cb2a16c20450a624291a2585a1a827712df984a04d7a369c10b121b7194769496760ac8c55c22c23740ece49af7dc2c SHA512 e6bced5e85e26f8adf124a4509d0333b8ec564b6904bbfb28d83792acbd391de4aaf829ccd72fed146375bcd720b7a51480cbda325e66bb632527ab28e0e0485
-EBUILD ranger-9999.ebuild 949 BLAKE2B c9062956afd9663a46f81d765ebf363a58a2485f618d79de0653a65063021dfa862e02cd220c9449c9d009f60e3435029ad581fa2488038eb5476ed5bf78f0da SHA512 b4fbb296526a3cee1285c9ab51966fb9c9566e6fd23d519381112ece7a3512b71a0d6dcd82f03a36e90c0a55fbf23e08a6ac54c56027ffdfb120d2cd5ca8e17f
+DIST ranger-1.9.3.tar.gz 280363 BLAKE2B 2698f82773aae0224e7385413a1f939cdd4b3374eddad496781a42b054e26a8d7e5944bf19bc846736a9171df317c0dbc3c8bdf83c6ca9bdb95de17f9229809e SHA512 5cd7bea714a6542d0a5445f5f0cf929b2df4377df3ef710f3786c6c46dd58b017a8060cde3969076637bfaac03c13297d3020fd82f4574dc49546ca223c0e8d3
+EBUILD ranger-1.9.2.ebuild 943 BLAKE2B b1660e5a0d60ff85a920797299a89a898b001e0e35a5aea67124c9adde8a2a97a8e1bc42f1777d6d8299f03611206fd8e591b4304bdc60701c534b6963a2f5c1 SHA512 aaa3335ebba2235918b0f2db28fa6191f5a25870da84e4f687bb34ca28c464de3d0499ce36c7aa1548557a583fb8d583273addf54f49e83002f67cbbf9db73eb
+EBUILD ranger-1.9.3.ebuild 945 BLAKE2B aee30c12ffd31f7616085bec62585d056569efdc9fa89168ff4cdbf8994857e58526e2e5a61a3c573f2b1bcd3ec81b63ab250805ebd3fbaf08c72de00f0ea581 SHA512 d9607d0a004c6f68d09ee6f3de3f591c1122c0018d3971a0d8d47c1dbb19912456667ebde7362415824d4bc2323e3271cbd735498c83326366f9934542c6a0e4
+EBUILD ranger-9999.ebuild 945 BLAKE2B aee30c12ffd31f7616085bec62585d056569efdc9fa89168ff4cdbf8994857e58526e2e5a61a3c573f2b1bcd3ec81b63ab250805ebd3fbaf08c72de00f0ea581 SHA512 d9607d0a004c6f68d09ee6f3de3f591c1122c0018d3971a0d8d47c1dbb19912456667ebde7362415824d4bc2323e3271cbd735498c83326366f9934542c6a0e4
 MISC metadata.xml 695 BLAKE2B df6caf08621cfa17c9ec7b75c331b329d3bc5b287418faf045c0b721143d802c43f87dba66695dd4352220e939c194efdaddd16f8c6499cbdfae58eb5f11d536 SHA512 01aa726ba045468046c2f4c7d0eb290f82da0c2548fd795e6c7d23ea33a00520deabb62ac677c215c58ccb5d156d007a366515ae8940bd09b3532ca94bbaed26
diff --git a/app-misc/ranger/ranger-1.9.2.ebuild b/app-misc/ranger/ranger-1.9.2.ebuild
index 48aa1b9e69ef..b8f5265c16f2 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
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/ranger/ranger-1.9.3.ebuild b/app-misc/ranger/ranger-1.9.3.ebuild
new file mode 100644
index 000000000000..f517ea8d4453
--- /dev/null
+++ b/app-misc/ranger/ranger-1.9.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="https://ranger.github.io/"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="virtual/pager"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use versioned doc path
+	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Ranger has many optional dependencies to support enhanced file previews."
+		elog "See the README or homepage for more details."
+	fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index ab9b014fc86d..f517ea8d4453 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 77af4de6cf8f..e70f3a10ace3 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD rbutil-1.4.1.ebuild 1276 BLAKE2B 6d8ab15276a5d6d1212b35aea2a03c58c2c33cd043168b06e66412143ef3c7544cf00695941252699e3ab1064e5c4086d06f8e15d83d106029e5bd33a8ff0108 SHA512 01f1666681057ef4cc0c80f6e16cc26719209c55cac8e478e05720c5e9716dfcb0b2e37a52a59f519d1d130e1e2ef991ddba4ba7c10d5eae8f5714beb35e8006
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/rbutil-1.4.1.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 88610ad3d9bc..2478bc80799a 100644
--- a/app-misc/rbutil/rbutil-1.4.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -16,10 +16,10 @@ IUSE="debug"
 RDEPEND="
 	dev-libs/crypto++:=
 	dev-libs/quazip
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5=
-	dev-qt/qtwidgets:5=
+	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
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index f5c865bd20d8..bd7aafd441b6 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,3 +1,3 @@
 DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
-EBUILD recoll-1.25.19.ebuild 3624 BLAKE2B 84ab7b3ae1b83e87aa38dd1036e6496ce48f07b20678caefdc9fb2dd1cd318d146e0819847cc7d685d417930afab3b91bbba737fc26750875b8ddf8362627eb7 SHA512 91e30895532e449d3e17d7730f461d0a7df44bd84158d2451696dd91028e6fcca95d244b3bb7a430238691056c300454a89d0626e71380e9fd92fbe5e88c77fa
+EBUILD recoll-1.25.19.ebuild 3622 BLAKE2B ef6de54e1c249519a69016dc60c4dcc7aa0908299a8399a725f9d068912fb0987fb1c5cce2dce53c4c4e37a27e67ec0e95760b232ae982f99a3dd2b8185f89af SHA512 724fa2f70dcf57a7cf921f9d282901d846b6fd103195883bf79465c1c570bba3ecd59619aaa0182285b3692042941172bfedaa1ac382d50d3c7c79525e39e97a
 MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
diff --git a/app-misc/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild
index fa65e8334460..69845d664f2a 100644
--- a/app-misc/recoll/recoll-1.25.19.ebuild
+++ b/app-misc/recoll/recoll-1.25.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils linux-info python-single-r1 qmake-utils
 
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 8df0aaf3ca1d..4483536e6732 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,7 +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
+DIST remind-03.02.00.tar.gz 365896 BLAKE2B 3ee47e5c0093c56a2ed95d41eff815ebac26523b64dc09b91ee46d66bac6b2b017d73902ffac61dd12c2088dac8d445fb41d832e22692f47e6e125162f0d436e SHA512 978ee2e6a45756e02bc2de0495d95c4b4377d9af76cb1ea5070f8e2438a451d2bf44245b93018bcbf6ea217520b7b4c8766d5eab354f9a0bc4982b25e90bd278
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
-EBUILD remind-03.01.16.ebuild 983 BLAKE2B 5d5a79588ee01ac1f38b7dc3ec1f578cf56d8d52ef0763af1f0899c664071cd4cf1088d343724720fe180111764af3f1e9cdd85ef82e7bd73c85ef36604fb2ef SHA512 38b0b269e8b895ab448bfca58bd93dc4e50df9268a98aa4a3d3a42f2c8d49069cf41fec6c880e41f3988ff5be85622ca2a5e9287f0164f3290bf498bbe618187
 EBUILD remind-03.01.17.ebuild 1009 BLAKE2B 4963276ab6516b75b19c4ac6ac55c43e9a159c3edc67479a26787ddad1d3b250247c2eff2a4a412d0b63a0082f2488069eec524fbb7438b0c3411b25b5ad3452 SHA512 aea067292b56634e21c5241a3a1378df4a559b80f8dd0ba5b7068b9c9c9cfcc84657cb3a42b53944e2c034cdb61e41fcb2e39468e9ebedef3a0b3157cb524dd7
+EBUILD remind-03.02.00.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
 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.02.00.ebuild
index 5a7755b8959d..775c66a900a6 100644
--- a/app-misc/remind/remind-03.01.16.ebuild
+++ b/app-misc/remind/remind-03.02.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,8 +35,12 @@ src_install() {
 	dobin www/rem2html
 
 	if ! use tk ; then
-		rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
-			"${D}"/usr/bin/cm2rem*  "${D}"/usr/share/man/man1/cm2rem*
+		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
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index d70982d14e91..af4dbe153f0b 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -2,5 +2,5 @@ DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee782
 DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
 DIST reptyr-0.7.0.tar.gz 30718 BLAKE2B 7cdb3c95deeab82898d41dd5047cd15ff288229145b64fce8efc5360d205a575a4f421ed52885c6491d56858fb7d1f09f0e8588a3be62d021bd26e554bb1ed25 SHA512 d95a05634f7e4e55f487577baee50fc773f0d9957be5ac1a678bd0434baffd994c08a884496f6400ee101333c310eaaf2150f9053d3b4b6e525820a7ed24a8e6
 EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
-EBUILD reptyr-0.7.0.ebuild 764 BLAKE2B 40ec574b493efa6d981f6b28c6628970529a2f9a740f5fbd67d5da69f5c898bfa9993220eb7a704529ac8e7db09c1a0fd11da0e782caa74b41adbe725ed2b5cd SHA512 98f78d3838eb6ce6e65548958e7ee787c5b1f2512769c17881a3be8768426ffce2894284907666644c403ccbacdba8f420afa46ae229ea3668a161a777cb8d8f
+EBUILD reptyr-0.7.0.ebuild 771 BLAKE2B 5a33a4f79a8040ec398a01eb9350c17c7c5d65706a28292b570e38539f3a3aac7fb082054e902754bed5d97db2cba92770cb53eef964f3a09cc0d6b86e1b379e SHA512 883f97472603864c8e90df265da8fb89be2531c62b788f8dee534c0d900578f9c8fb549c02f8aa47aea2d4c8cac33d3664b67979e5847ae1bf04f5a3bcd6e883
 MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/reptyr-0.7.0.ebuild b/app-misc/reptyr/reptyr-0.7.0.ebuild
index d8ca305260d3..4b6afb00c2b2 100644
--- a/app-misc/reptyr/reptyr-0.7.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index ad41a50b754b..142fc9fea8c9 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -3,7 +3,7 @@ DIST resolve-march-native-0.9.3.tar.gz 7780 BLAKE2B db86a0fe9ff92fc0bc45b94ff36b
 DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9ce4ff6ca6ed794cf826cb141cd83936c2762db43d1d7b64fa6f39e1216b4738a58c35a07d9df7a78dbd061de636b7b181fed SHA512 b73e34c9f957dd3f8941b7db25af88b32cc1f67e4384c97034a310b98e6f6e6645a583ec567f8b1547bea41e072fcc20189017930a172781061d741839c5a9b2
 DIST resolve-march-native-0.9.tar.gz 7688 BLAKE2B 78ef662691071b480fd382a30024f9fc73ed8f7b22b3a814237c99139d3ba6d22f348ead7c413d199875ed74768618ac97d897204a7f633977a5c5bd8726154a SHA512 2079153a1d7f8f352baa1a0000d9e120d976bca8cef2a81dde85ba1689a260fb899c8b6d97f9cd79dda41c5b67b9fe76bfdf0fc5bc88ef09d2915a29f3ed33e2
 EBUILD resolve-march-native-0.9.2.ebuild 486 BLAKE2B dc0a9990c7da42847d560aa4df84c2edb6fc720d13b3090358e82c9e228b1b1e7c12d1bfdc2e47d30f00e9453d35334fbe71d5fab23a57e4fe1e98b0a38b870c SHA512 a591cec96d1bf8900df12e33f455ad1979fcee82f976248d2864a12ab9336175bf9cf3bfa18ebff05fe4964cb825aa66326e5dcc1e33b0a64bef133ab82a9fde
-EBUILD resolve-march-native-0.9.3.ebuild 502 BLAKE2B 78461bff40938bf11bdb90d8468f54796ed299a1a4d0cc8d6f286f5e33baba23e4404806b9007139511d95dbc65ebafaaa54c12e89d45f59a2f3e5bcc143ac81 SHA512 2378880e8969327db1409d020f29796bb65a32162a638bd7dc38b86d7803fb5666a9d6539541220d576d1489340339a2ea6ca8476c6e44667d71a88464dbdbeb
-EBUILD resolve-march-native-0.9.4.ebuild 502 BLAKE2B 78461bff40938bf11bdb90d8468f54796ed299a1a4d0cc8d6f286f5e33baba23e4404806b9007139511d95dbc65ebafaaa54c12e89d45f59a2f3e5bcc143ac81 SHA512 2378880e8969327db1409d020f29796bb65a32162a638bd7dc38b86d7803fb5666a9d6539541220d576d1489340339a2ea6ca8476c6e44667d71a88464dbdbeb
+EBUILD resolve-march-native-0.9.3.ebuild 498 BLAKE2B 270d1d95501b0d14543a7c2127c49730174f17abfa902ab8074a242937b75fd057375238854aa64c169431b718b32a949d3d46703bbd597e4089f6cb19fcd171 SHA512 72f20203c1859e29284b95bb149001468292562e23b74c066d3b94354788bf3658c2cd1aea90d697f435b355d3ced55f127f083b564ea5270fe7e7b6ffc24e78
+EBUILD resolve-march-native-0.9.4.ebuild 498 BLAKE2B 270d1d95501b0d14543a7c2127c49730174f17abfa902ab8074a242937b75fd057375238854aa64c169431b718b32a949d3d46703bbd597e4089f6cb19fcd171 SHA512 72f20203c1859e29284b95bb149001468292562e23b74c066d3b94354788bf3658c2cd1aea90d697f435b355d3ced55f127f083b564ea5270fe7e7b6ffc24e78
 EBUILD resolve-march-native-0.9.ebuild 442 BLAKE2B bc0d1a73c4e58c75a7ce0ea00bd152218781602a225a6fb895d112addc71015ecac6ccc6a9ab86c4bc5c37306ca9f22c8545a99a72ecc5de19521b16b470d85a SHA512 399cd94d773ec28b5dd53961c290aa6a9c5a0a99c089df3f4e348cc877876f0b0c0560a97eaebca104c954b61108a510f71060909dd9f11d003e0beef248b24f
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
index c2761b473b9d..2c8b4c6db6a6 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Resolve GCC flag -march=native"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
index c2761b473b9d..2c8b4c6db6a6 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Resolve GCC flag -march=native"
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 9df1a0268e0f..3da12c745bb3 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -90,6 +90,6 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 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
+EBUILD rpick-0.4.0.ebuild 1721 BLAKE2B 99bf4ac06651352a6566ca819f2affacf3fc5177931347d08205e0b6c0f1124564e378c5fbf7ac318310d16948b5c751d10f1268adc43878ea3eadb4fbf92d13 SHA512 f8c81a153fe04392b0c42556cb15b4e62046e50a96c20f9d6621d6c3b8f9589e4a26773a58b0d77eaf4e2b620c58e9f7ace3017f4af6705f1f1e8d1b60042afb
+EBUILD rpick-0.5.0.ebuild 1825 BLAKE2B f810db884970319868c6596050ee9716644aec45f36c81f842c54165b972e8febe3e23bf6308cd3cf7a73950b9c5506ddd4141bc02aa9119e6ee22af7581e671 SHA512 6489f9fdc9ca62bc47339ac18a3760576d0a50a4d2b46e425437dc870d7146b9cc5796165f41c02a20cd29fd950186cde9b2eefc1ef5621a4b81266173e2d2f8
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.4.0.ebuild b/app-misc/rpick/rpick-0.4.0.ebuild
index 81020abaf456..8c6d2ac42816 100644
--- a/app-misc/rpick/rpick-0.4.0.ebuild
+++ b/app-misc/rpick/rpick-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.2.0
@@ -82,7 +82,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( CHANGELOG.md README.md )
 
@@ -90,7 +90,7 @@ DOCS=( CHANGELOG.md README.md )
 QA_FLAGS_IGNORED="usr/bin/rpick"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 
 	einstalldocs
 }
diff --git a/app-misc/rpick/rpick-0.5.0.ebuild b/app-misc/rpick/rpick-0.5.0.ebuild
index c11bb5b083d0..d029e94e66d9 100644
--- a/app-misc/rpick/rpick-0.5.0.ebuild
+++ b/app-misc/rpick/rpick-0.5.0.ebuild
@@ -83,7 +83,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # 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"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DOCS=( CHANGELOG.md README.md )
 
@@ -91,7 +91,7 @@ DOCS=( CHANGELOG.md README.md )
 QA_FLAGS_IGNORED="usr/bin/rpick"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 
 	einstalldocs
 }
diff --git a/app-misc/rq/Manifest b/app-misc/rq/Manifest
deleted file mode 100644
index ed13b1658fa1..000000000000
--- a/app-misc/rq/Manifest
+++ /dev/null
@@ -1,111 +0,0 @@
-DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
-DIST aho-corasick-0.6.2.crate 24901 BLAKE2B dd5accb79b342e5d03387a4d6925f8753fe5584f48a84fad4357c20c596356c07b020adc484e701e59525b9a2f3fcfbc2726b9126d61c0f5a48af3e70cd46cd9 SHA512 81a013deb96b88ddcd1ddaa10c09075feb97078c59e3fb6a49807a5004effbb523e4572fbe297fe96678f86e2529cc8afa919d3b8f3c9cf44fdee97290904229
-DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
-DIST aster-0.38.0.crate 27090 BLAKE2B a8cab0d8775261a77d7d693219afab694f8039e3e2ee3d1e8b2a4cdbb96a2e026e3abf892d7266e9df4062d457112d2798c92ef387bbce5d772fb9c67e131b96 SHA512 1bbf7e4f2b75ccfe46cc0bd960f1a0d30b5b4805c7a9d291adb3ca7dce52c271def4932c77f4824ae2a979bcc17e6fe254ef90b1b3db004fca4d559b17ccdb71
-DIST atty-0.2.2.crate 5124 BLAKE2B c49d6ad5d47be2910fd9cb96bb68ddc38489e800894679df7acd15c88d834035d9918afceb219eb6ce127e68ef2c7eb25a04f022218189283cd8d228861772f6 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a
-DIST backtrace-0.3.0.crate 24035 BLAKE2B 9a6b906e9ba4a73a6fd4c025c37bbe0dd9ef632b95d6a3849d2487acff639bb73e74967f01b9212adb58aba6736929839da167c881a860a266e391e4f3a0d0d9 SHA512 523b0f1f2457d3699e6b173647737a53bb6d92f3381f1a328bc2f9cb5733e7064795fd157990df6d94b30f587b15dfc8d8438fbc74d2bf2d08387ad24789e673
-DIST backtrace-sys-0.1.10.crate 282652 BLAKE2B 02dbe6d31f574556ff677b94f48ce99c0af907485fdc54323a69311c2fc7a11efd2d08bf36fdf673d73e6d1c5c99edbd3d208406215b93b7ea04ac6266db9daa SHA512 063a31423568e4f7a5a4b1dba3ba32c6ded4bb991833af569fefa398e8710e3173e059828a5c55489003d5b918b834530d99ec51a5b248f9955b643f719a5de3
-DIST bindgen-0.22.1.crate 1214174 BLAKE2B 933e020fd717c759cca6d55c76d941a68c429bf600e90cd81be4ccec3e78eb55b59c664d6dbb601c52ea8458df7e06f58c2be2125adf1497ec72a52c200d03b5 SHA512 ff5604687724a2ac73b78226436db6c2beb7598497b6fb237a3c5a99a969d81c57e6f7f7b80c353d4c5b5171b7588747e8b5111c79e24b2bfba75e39df5c3ca2
-DIST bitflags-0.4.0.crate 10186 BLAKE2B 18d35df427bdee8b345cbfbdb891cf97b5c82ecf6a93907aa7108fa5ed83d15f28d5c510e1045beea26c70291cbe6bdf83c3d681b91b23601d8abc253830ce9b SHA512 ec056552194deb660e78219d6b13c991227bb403c06ae97e9a72fba8405848b2cdc699ae9ac8bbfdc665aeaaa9ea6347139c1d2e0422dd491b641afc101c47a0
-DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
-DIST bitflags-0.8.0.crate 11128 BLAKE2B 37a574fa8201ab43b3c973c3bc74c3f1f40f7e9f4276fb90f3410582717cbfbec133204eb73cfa37d3ed7d22049bd5c3a674bdc8864a378352fae0e2795595e8 SHA512 ba937c04956d0d36ee18faa37524f86e9ab5224e89172e4183b0a36344333a99dc6050e41a5c4c7f77829aee831acb5320c4a9c2ab06b4d35e76b315d980a846
-DIST byteorder-1.0.0.crate 8450 BLAKE2B a9a4bb6815c7e8eee9a1bf8025780ddf81bcf887cdfed86926bba70853f647cd3979bce0ac5b3406bdd5213969ce3ef82cbaf53ce9d2876a290bc841e1298ea4 SHA512 5122d3112973e96cb00211ea586e991cb0db18df4ce871d24e4d4ae12bc6630f6ff55ec2e3224fb6976afab0a6f7fb7913b8280cd991cb0ed742dd446defd12e
-DIST cexpr-0.2.0.crate 14067 BLAKE2B 7df29661404787696470c4ff1b0fc51a682d237e9ffbcc8996ddc263e948810d35d9e2b9ef4748702e00fd67b470127ebaa05eb4a4f75641ac8c83febf0a34cb SHA512 44261e3a96bf36bab0ddb5bc6f3e4e076dbb3fe2d3357cffc352f84cadca7a659cecec33de46cdd23c14a8a62864038dccb4d1667b9fd70a22753c48c9f34962
-DIST cfg-if-0.1.0.crate 2758 BLAKE2B 8ba4ea4deb8cfeb4927edcc9112346650eb9b2f5ced13e4130aed6c030f8f7bafdb50ca4b25f2124636058f09ab76f70f6a5820cdf31186b5f5699d7da4db03a SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb
-DIST clang-0.15.0.crate 50520 BLAKE2B 60fbde8b9dcbd6551edd21332af088738844db1fbbca7e76cec618d866e8dbe094a347216990c504a152b4e65f7bc37d0d29a9d9158ca03888719cd586ed3d84 SHA512 f51a06728d4b936f606c52f8a43cb3d34aa8611bc28ebd8afeaaedbcb7cd9cd56274c0e421d5dfbb584616b63ffc25295ca0f59b13bf028d3d286374a9003ed7
-DIST clang-sys-0.14.0.crate 27025 BLAKE2B 6dd9507ac534c5155e482051e521bc47d3c773d89531b325f7b1cfa66b0d20df82f440b7a9cb8047eb6b74942118462583f1141e27052c44fc8c1408c6715c28 SHA512 fb759afcefafe7e0d5c99fdfedbad27462a5af38e89e05cf93da796e8a2074be11a6ddeeee48a3ef54a1342b0a4182512aaa9ae3a0d3aa1d20d21b31b70dd8a5
-DIST clap-2.21.1.crate 172811 BLAKE2B 4a07245cf2c97263ebff0d66ed5214318710d6e695f9c597c184dd51df98570d207be4b4db5edf62d77578a2b3b74550cb1a36b63f4d09779cf11781937f4dde SHA512 35edd90a2f21b87dfcc39a4789ed9811d84e0be828caad24e745b8bc73b8745df3f4b29b423e51a6b724e5bb82f8cf2c36a9feae5e243b211f5529c30bde0e14
-DIST crc-1.4.0.crate 3443 BLAKE2B ae750a28d8ffdb4c5dff289a917e4238e68b99a6a25599029fb8837ad26538c401dd22a0d1407508dceb9eaf52db81334e3dc83d436aed4cf48804890a95c599 SHA512 f031f977bfa755222e1e73568979224c12d71d53b7da1910f73e24794067e19ed38995385cb0360aa827ce625301f9facf53cb996887fa3fb92a0698a1a6411b
-DIST dbghelp-sys-0.2.0.crate 20721 BLAKE2B 15b49d667e62f7182cbb2f413459c872489e68a8930591f56e92d673df4919a0a78692ff14dd45beef6ea01ec6db562d052f135d275dae667d51763ccf754023 SHA512 83588245f1df7db15d0c1b0b816e183c75238bcb90776ce42d9be4a9f06c64ab761dc10e2b3da566cf0c392b22acca60c96a8a40f6ef95d4d3f3f570af3f3d0d
-DIST docopt-0.7.0.crate 41313 BLAKE2B fa6503c52765e2d687da6c8edf1d8b5d4e73e46ba6307611351189218e00b4859f5297b30ec0fb30a2334c65a3a9f4d0b869661bf97c0b1783fb6d4bf8da6996 SHA512 f95549388ee834bdb3bfc2615338990e2e496b1e5059bd92376af5e3a173c365101c5fcc7e82a3aa0ee67ea8362ce98e19df4f02bf65cf14287d61e68299be09
-DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
-DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
-DIST env_logger-0.4.2.crate 10386 BLAKE2B bb45c1b965c043b0c9a351ad70a7642d66094424b90a61c4e87510407806e07c764855472a06fa0e9dbfd3d56b30421f5b01ab185cee3ab6d3f95f0bc5d30fe7 SHA512 97d73292892bdc9439252494ccdf27e27c5871637ec0d6053dd8eef8df71913baea54ae45ceee3dcf8425a8be797f136957eece69eb1ecbe876dafa74c070703
-DIST error-chain-0.9.0.crate 17627 BLAKE2B edf874f642662fb474e2ff809f3a5b8b6c722cdf54e108b193e28bec85dd463a80e8c235ddff5b0571eeef1f4b1cc9d837d97d1eb19467b4904196d35dc16452 SHA512 c36dbe13e582094b250f7427768a7d9e432d82fcd7ae3d417a4140021a5c0e96ebc35aae97a7addb2c55c8309dbb2a6a71a3fe800281b69de3d4a9c7503dd459
-DIST flate2-0.2.17.crate 47795 BLAKE2B d6bcae7d12040f2fdddc33828e7c66ee8de47469c4b808ba10239ad3b31482ddeda0f39678a6660410a3772afc3546c03aa4050ca6f83ac532f051f39b8fe104 SHA512 609f2e3c71e8889ccc3682fa62ecf52a068c1e61040b2e0eebb7b8de7784dd595592bdef34c7a03e0587cb3e4c2e2d8de88eec113122a222676cd4fb7d8cc775
-DIST gcc-0.3.43.crate 26087 BLAKE2B abd5bfd81c628a2f726fb3fca90e87c87de8a78d58982b1db20b26dde2a182a708c4e30ae2b0714aec8d8d85c9e0af508b093e1a53a7ab9b41543d4dd508cc10 SHA512 27dd847b9466140d8cdd9bd4ac466d2ba26a93f858fcdcc1d58a59b08207f34f283004512faa53c4d8cf9632e0e9199c0f42db6df1db9a8d6b96e72e074af5e3
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
-DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-0.2.4.crate 5768 BLAKE2B 8e022af18457ba9e070fb4a1b5a2a5b4d2ba1cb68e8d20402d79a7dcb142f5d5ae19fc2b666189b8e2616b0251f498f9f262e629a0acd9d98aad0a163d76d6a2 SHA512 80b0168325a70ab11e86f6891ab442e33deb31c9b091d095ffcf5149dbfac7569f5bf5bcec643cd98d9d1ec2f6ebc2af52df383b033efb1559089f128e4d4748
-DIST libc-0.2.21.crate 132909 BLAKE2B 849dec2a553278f1d8d4b60f8c8092d146ce2e2e89432a643114c2b12ed183390c307206ab3f847242061f61a88223416e437707810085535123b7ccefe56408 SHA512 987cb36af3e333ff93a79b0164c24ea481aa72354a9294e9824fbb29bcb4ecc4fc95f68315c5831fc2d59521cb395825e7fd400ca943f36f5dd30b595c34c1bd
-DIST libloading-0.3.2.crate 14013 BLAKE2B 210bd0c9a4db4f79f094ab89ce5de74f49fccc93c1c4650ed2afe563ffe851795782bf9a89e273c50ae32d8568dbe0551dfadf766cb3d3e64341649a839bcb57 SHA512 4c76cf02f4001d9eadc39f13c82de4531c3ef14b72082efec04b10f0b6bf5fd0fc1972e76e268d0d6ee34a9d11e023ce501f347500f19a60be13e83fda101397
-DIST linked-hash-map-0.3.0.crate 13693 BLAKE2B 1d533fbe24475d831d22b64896a8e2ff7dc370c797c1fa7ff2fa6cacd43a87d08e68283436347458c4f047c938a5e45048b5f5801204f7411fd775e5ac7cf1dd SHA512 4e93c0ac9fc64beeb3b800ca09d4c701f7fd35a866c174588a9d174604d5b820f43c21d48b4e00143770efb1046a053a28004258754930f2c4ed76b2ff8ed8c2
-DIST linked-hash-map-0.4.1.crate 15510 BLAKE2B b86a61032445ffabffe5b04bc578991a0c909806fa59b4a8c3b289237824dced1a25767a1c0986c645aa6a7629bdd3ad73232f92810502e5df4becb6251fd7d9 SHA512 85d22f25bdcfe1eb3dbbb688a6436d519189ed78598348efcb53f40066ffe62962c6d8030b6f1f18ed594abd9270177abbf65c30390954eb9d0cb1ac8745ef17
-DIST log-0.3.7.crate 16352 BLAKE2B 3cf2ee7179bab3535f632ef0447929e4c4af73e74c5549857e615dbf830198f5d5e9357406794a5aeda39d963737db57b90af02a6b499444b82d778299792d88 SHA512 6befd815071738e24b62feb8f45de23d9927406dc185f37c63c0d9141e315cc75077194dc8e8e1d3cddb279836decfcbf077346a086ed7673b43b4aa512e0dfb
-DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
-DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
-DIST miniz-sys-0.1.9.crate 53242 BLAKE2B 1259dae3c0c1d37c68e947f9f64e8c4044ef7eb6d900cc8f6a8ef07a42454beba4565885c301021cf925096b605fbe482d22df6c6f9b44a228e7a6fe468ad7a8 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709
-DIST nix-0.7.0.crate 70639 BLAKE2B dd849d0fb540ed937d508a7a73079c6a955488d7b4902bd32ed15b08b2e740afaeb98b00527a5e2997e2aca79013bcb9465ea1691fb620bdc9a203533ab4e162 SHA512 ef96fc40683b9eca0df38f573b09a4986518f810033cf810915e60eaa4582494113280a1f17d25c1e363a02d8e2d6328cd8a6157ba5b35fe65ae80456bc08e77
-DIST nom-1.2.4.crate 68547 BLAKE2B 87ed1c1770772beed7e2b5faf9a63ce4ab506913ee104a7e36bd64a69ebd47b7a7bea2ebfe1cd14a54e87cc671340b6768cdd47de68f163e48253f02283a13ed SHA512 4a1000f56dedfd71b1f91d44c27c07519f81629f5fc24b469d179d59e8b3305c8ae1a418fa60193be1cb4289887af2ad9b9791dcbf1f6e7a5eda36171a314539
-DIST num-traits-0.1.37.crate 20492 BLAKE2B c7327ac98110871c9ce2896653c8b7c7e3ce04b966c7e97f21608ca12d37cd03e771b0111a6e7eb2804055bc87f13f38709130e81f1b559d0ea40182c6f8e2d6 SHA512 290c7ebc5a0249d9fd937350b854cd5d181dd0ca989a6d9b3d5e05e438343083f40261b4e151f3ce5546e9f9a404cb091b587bb7e1e193fbd26c3317b122c2b5
-DIST num_cpus-1.3.0.crate 6779 BLAKE2B ddb442d73b2d49926c82beee263fd34e5fc7dca6b835c51f8d0b4444eefa75c90220d025acf1a2d99cec2cb02b957c76234dc59b1ed6aa56384f81c1bf3f0786 SHA512 000a17ed9c1e7b65697cd79658ae78b16816aa55ca7ba82ba4fc184f01543c01d69ae19c836f23c2fdcdd78034909e8b0db3e8fae581e220813c628ae56a8fe7
-DIST ordered-float-0.4.0.crate 5034 BLAKE2B e7b2ce8ea84df23064420cf2cbc9a7417adc4be7d7c88186ae1e183311fd1a5ac75fef9c48d5c3b58de3c4f1c205f8c4bce81f48365505b400357b22194d8a16 SHA512 c78385d27bf2744042ff690e153af56d35e88c0bd6fbcd4275e193b99b4876187912aa7ca3915de9021bd870ec4c32c1efec45964ca72b38e04ce2b2e3d77ec2
-DIST pest-0.4.1.crate 39337 BLAKE2B 1512176371aefc05b67a4abf075d6b6319d48f77181b3c5f4764e793126f126977ffa4393d639c1892100c406cab27ee1394c517551670f5ddae7eee512599d6 SHA512 b23465a79e8390abd28737f9eb59327e7d4ac2104b5558e08dbb0bc4e2115e1fdddca72b9b1f0a617ba1c947bfe613305cfffcb527be204fbffeb8242f3893a9
-DIST phf-0.7.21.crate 3484 BLAKE2B 761dd595dd46ce61f6ea729c6c2c24d0a4c9e88744c837c70626f72d2c3c428c8753638493cf952cc7d731135aadc586612511bdb547c5bf77a30faef442934a SHA512 272ddb670e314fa2f01a7cbdc75d247ce71ec29bd9b23d3fc0f30575dfaa3ed6020d64b9506e9c6509a8d132b9ec5da3cef52bebcb752bfd2d4d2b4e7a778da5
-DIST phf_codegen-0.7.21.crate 2498 BLAKE2B 2c0185145708f13a9c1cff39f5a291f9cc9ecf8c2569556865e749abe84a1fb5b08d57bfc5b1d2758643dcd292477d452153a6a578c22ac60833819dab91827b SHA512 4256fa25c9472a810cf6acce07287aa36c2247b40beed1be0e0e132268e3040471d35ed5103bbd2880410cb7da0d1153c045fa28e851105798281f5f2361a310
-DIST phf_generator-0.7.21.crate 1821 BLAKE2B 45fc1498c3e0cf3cb7a812c464e8f25967a59cebe2eb62e89d929b716c0b8796693987c3b49611a9d34de821abdf382f4ca28afe5a0824794110e1d80d18d7a2 SHA512 853ce3bab9119225076c1347488f0aefb7cba398d5c0be572c8bc1ccad8875ec6f86a0eaa998773b6ad3788417fb2c6adf78a3b778f36dfa5236fb31ed304c3f
-DIST phf_shared-0.7.21.crate 1692 BLAKE2B d6ca917a7d2b3a460b0adb406c359fe253ba3facdfda526017385eecf04436262fa214ba03bf9e949f61e20c5be4fbcbaabe37b793916e5a3a28221ad5b85fdd SHA512 ac92bbbeaedcbd02d3e62a9c7d0c6f22abeeffc5c7527c764b3e9138a2821dca667a1d3f29178e812b6d81ac50d5e6562b929650a0ee66fbb8d1c15366ead279
-DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
-DIST protobuf-1.2.2.crate 168801 BLAKE2B c59d8e4bf166ef0daf22db4c5aaa22b7f81ac80b9133183bebfa9453405ef75483b29870840190259a1feea3653aa2600ad2db3a008391fd64bee0c70100bce1 SHA512 8134ca41baec01dd74a108bac1e636d2ee78403d6fc9ce2330724ef20dc8f713a7eaa7d006952076141b0ce4842ef771a99c3fa42197ea3ba0c6ecb3eb50db1f
-DIST quasi-0.29.0.crate 4115 BLAKE2B 4205280a10210f29e891ca880e7687b87ad3961914cb721898420b947d621241e91ffdc5a54ae5227336af9036bf5aa19608c3ae3af99f4f42a9e5a9cd32cb8f SHA512 0a2bb45a964a0c806969ea51c58636affee66c54ec9c952a295c0b43f57f106ebbfe2ad7188be9e35f39fadc17999b1c91be66b873131f04b04b7725488125f1
-DIST quasi_codegen-0.29.0.crate 6838 BLAKE2B 2c5aad5d1f88e637d84e5cb3cb2de2e046b2e32f650b843e3c7db6c0513fcac5e568a8c74c88c8c6184dcbd33921f331429b61360d0fb9f8effdd1d858ee2714 SHA512 9eaec0c3d60b78b09f569fb0b0b0eea36ba72ce0ad10e1ff9a919732debfb7d45c0a0c82f8a065e90491d6f0551f59892da5a46695aaf906d0043d983e33609c
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
-DIST regex-0.2.1.crate 189277 BLAKE2B 25ab16e2dc191db7ffedbb741bc9fe579d2197f12fd3cf717ec393aa39a433511a8dd30c0a0a0b13c05deb205801003428516cc2d7a51c5a360f8257d5a5c9a1 SHA512 d098065bc8365e2ec584634bbf2547b89f51fc08825d10cc26fa6b8c81213612a552420fc16ebff322637baff95669552bf95400cbef0bc9a86fe7e0bed9a0f4
-DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
-DIST regex-syntax-0.4.0.crate 118223 BLAKE2B 218847fccfd9cbbabf3d56bd6a423b46f1a5b841ebcfec086ede1e591389b6cc6d97c97fd614f27c8b2bfd5b3af57096fd4fbb512b692e4c5f429ccfa32884da SHA512 c2167926c7bc383c71205e607f21490f434b90a0802eacecd0805c9307bf58cbfa7437e1034f96586e472dfc09d63b2907b4a8179321efb38365b4029458616b
-DIST rmp-0.8.5.crate 19960 BLAKE2B 96b29bb54dfd23a0980b6e5ccf1594262d54a0942c2f8c41952ba11f2f1397c01522052e350d1dbb6ecfaf185444436198d3e7110050d8c0bf8272a8b668f314 SHA512 d894ed63d277be765d4dd39b7751972c8b4a801cec36e48e65a39d220ee3de6b20b0654e7dadcd77150f8cfaea2ea6a4bcefd3e89c65d5f48c1278d4491776c6
-DIST rmpv-0.2.0.crate 13749 BLAKE2B e1e6a783a762c53459b9fbef1382f1289e5a60bd8a83534c423765e99c3a186416a0cbfe320cef68e4a155e237717f487d9d6572b4cc8c33246dd05471c760ee SHA512 4f79974e39bd5aeccbc26e8123e1ab30344c5d5f9396807ec8be3a7efc8a9ea692ecfa72a2aa309f7d1d4b12da5de7695984a0bc09f6086c2c2aa48ebef3ec2a
-DIST rq-0.10.4.tar.gz 2831387 BLAKE2B 6cf778f37c955c203c0a49983933a0b380982d55dd57d467f68bbe60f59bf70eb79dfd7a5e0df75b6acc5ec306e0277b1c1d6fe120b973cfed7c2315b2efce1f SHA512 e702b4ed082625b856b71ad772abbb7caaba117a686ed72e3ecf6a28102c1f3d2a535d1c8c0b7ae0816e88dc3e3416a4a676785f01644dac89319320cbbb9d41
-DIST rq-v8-5.6.222-i686-build.tar.gz 401175081 BLAKE2B 1faf71d2f279772edaccf797e5f522623443b509786b3788f1be4715878ed025092dbe8c6c6b8885836f78bc72b4c8b9744384fed236ba736136839ebea0f346 SHA512 b3b89e3299c761c9ef087322d2f255eeed0e52faf51eed580847c0f26f69405bcc07b07499c80ec814f976d702c211c8a6fb19858fca1ae8afb710d75c4b68f1
-DIST rq-v8-5.6.222-x86_64-build.tar.gz 435523225 BLAKE2B 54fabf9e724ef86c9942ed1fcb6c3a07090118e7ccc58d9c57bbb8b84d0e2963e3efda0f55a3a6a0a98564afe8e29136aa799a5c14dbdc508c5c6e35a9d7a4c3 SHA512 3f54cdc19ca87dec8926379bdc5ebe6c9fac6304f5aa15274f89f51baeb692948de27ee41ed7ac689a2b50a070feb2fe1d7ce61f27746cff645a48f533fd65c2
-DIST rustc-demangle-0.1.4.crate 9438 BLAKE2B 695a8e529090ee9293a2d01339a0f0d4011af010f40964f67ce862dd93c71643e468f4d3a2fbc83430a8ad775a824ae56cbdf59abd4808c7696f76446518f91d SHA512 928cf5537343ad3bba3aff4b09dc51921b6823dc7a450422b363cfcb84ba65e19393dbcf67657197cf96fdb4b9b0195f42b3973473f51085610c90c8b49c4e9a
-DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
-DIST rustc_version-0.1.7.crate 8816 BLAKE2B 1c3cd80bc3204d27a9a09f4ea8dbeb1624decf9b39ec9e78276fd50362354e59a5c31250c01d136cccb7c717655765d6f2781ab7e04a614f55bfaf334962784f SHA512 f7ceb913f93444bf98ff8113beb96fbd013ecd6c0f31c49aeb738f418f2e5a958c54afcce6e5d017d66a2b47e07fee032aa07b0aa748cd3be67e672cf48f2b48
-DIST semver-0.1.20.crate 15876 BLAKE2B 33cd644289ac054c0b2423373e4539d95c494f21e5c3a8290d9a8521b25e86222e7abe697f504a4acad0e6caf72754c211f0fd0b3feae69f7dfa98d020158968 SHA512 d24401aa4a1e12472c799fd9d2f50f5965e4d2d4a5eccbd244a3f817797fd58cb073b933d45415a1a8d71084deebe04c2277c435da7f359e510c52133bdaa08d
-DIST serde-0.8.23.crate 25824 BLAKE2B 96bc2e07504202ad51dc20cd972e7a3047c26f2dc892d6892466e92c8e9a58a65664d9a5f6f2d38ad2c9e0bfcffc0096b913b6c5ef1d3736d53114c13f00663a SHA512 537761d0fad243799c63b742b9ac020195ad5575e346080c2cf19b1792d2026bdab6f61550679b8883f7af5e16e98289aa749f0646a6d4b0cb24eec0f7d92edc
-DIST serde-0.9.11.crate 52571 BLAKE2B 7b3c3611e0254e4c8eeb64a2a69ad5f0623950aa23e36557faae6a48799f6f3b4d843da9ccac8970fb994c71ed2f3f6369c68359b281b918047f4ed7c1de4d53 SHA512 985ff9fe37e16289c6841296f7c98d1e079f33e503ab9d5f51145d0ff45da3b6367cf373a4027035521674c5da327bfa38c2afd342b5faab3d4a9ca44eeed2c4
-DIST serde-hjson-0.8.1.crate 23130 BLAKE2B abd3c64f47716a514ddc686b2eed6aa108e437762cc4e7b251fd27037123b002c9c02ae4f31a28a498722ed1f0754e19633bacb85a0fa9e4ca0fb67b691de441 SHA512 6035b449eee70ffc7cafd2d82eb68c7aba79e25ce8cef56e1fefbedf66109ce4ac2a3bcbeb7c8f6f1f8af7c5e29a24be7a7455ce3a63c5b4ac50e436c0bbc718
-DIST serde-value-0.4.0.crate 6978 BLAKE2B 6493defa18676730592bac478dfa08945957171f65e84db36491eb0a9fa8f054586937eaf191b0bc4e74034c01c99fd56acd9591f2b88f940733794453423e11 SHA512 5b8670cf2bdcd93813609a18112a6a35c1a59863c810b8febd4426fe6cdf84ff57b78b6fa31815d2b1d02c2c8b355302864c58fa99eccab0c4da07ab4f34cdad
-DIST serde_cbor-0.5.2.crate 20389 BLAKE2B 2da66e9d103aa8d34020c49a80781900a730ad827a616faa8de3f1250eb8a6b8b20e703b9b58aa3d41023796fe3e2dbc60da1cec2fe6e650319d21d234a8f0e3 SHA512 c0cf7d0441afc0cc7a03f8ff31fd836b4ab1dd42005efd4c72c4dff145212a40fd77a3e5212bff95c64f32e9115f8aa012f8cce2fd6cc81dcb0f2b2d3656af3f
-DIST serde_codegen_internals-0.14.1.crate 12211 BLAKE2B d41b24afcb11fc5a4ad1e325bcd801bc5c9d0565b695008a7fecedde682650a06a29e8881a4ba162a363e47434fff328f48c200f376416abf2fade7f1bbaa502 SHA512 db3407c83d3ef0714073565f03d04256531547d9821fabb6bf0d5e7ecb7d1afbf3e70b1644683a063a116a7f0fc7fd3b5761c13cfc157d2bfdb7fd72b31b115c
-DIST serde_derive-0.9.11.crate 19929 BLAKE2B 49ceda14a1c33171f0cce1fb544194a35e173d9e170bf2652754ddb658132c9684cde66651f4cb43837709f78f19774d3b83bb0541846231113b86690b348093 SHA512 f8855892337ead9f4b8ba541b4980b358f045a63ea2923709989e61f5c23c8327e37114dc3724a17113d89027dda03c3d408fa3e2270a9b61e57837852b25311
-DIST serde_json-0.9.9.crate 46711 BLAKE2B 275a3e9b6a33ab473dd188b6ad2bea699be540bb2eb335b3d4f89e0c01c82c06ae58628055782ecffc6af6d712d68968e76c377069d245cc2395bffd4513c0ae SHA512 cb1a1f3ccbb8aed77d92faedbc679758ecb9ed2d1e73fe310638006c42c48a3dc7b8c689699e379f94c4f155e94c5692579bf003eb341d3f943d46034c0539b4
-DIST serde_test-0.8.23.crate 5068 BLAKE2B c6f4fb735796e3c9832f9b257aec426547a37a8a410a422a2e35b95928c66a923f92e221981342fe3516ecdc9d67729fc35fb3810a727cde61abee3a0a69215e SHA512 bde1913e885d47eb1f96b352baa3f6d4f0771fb9cd35e3d0e6a43a1dfc9abb6e58a2191947d8e3c75ab6023e7ae17c6ffa5ac89c1484099ea30dc248e59c59dd
-DIST serde_yaml-0.6.2.crate 11451 BLAKE2B cd632d56ee89cca6ab00da3f36f2e39350306d058a8c860e1ce7a5a9de193a36287629f3aaa9e849a586823d3cd41379dd65b9775b58edcbc15b4bcdae405d06 SHA512 bf6cac18984d5669a91644f0d4a074c609a94613e23359240a5c79c9ad3861b547b1795915e886c3b2345fc326bd52d991441d52a58e52b14b9c4b0f1ec27939
-DIST siphasher-0.2.1.crate 8339 BLAKE2B 52b83bd3d97a4e9b906abe5c01e607907c44c291b297572c7f8f5b2c5086625e700b0a36a5364049a2b35a4060e0e08af2dd418fb60600bdcc18488c642d5b6c SHA512 3e44112c5fb82e9fe21a70a9aa8d4eb4dda22c4c7f59c165169c2d6b1f642394587adf1bf506d4493ae2629200e6516d998fa6a24c24e27b1a70d2680c723ca4
-DIST snap-0.2.1.crate 1072209 BLAKE2B e1be5fb62c9af3a426d0347707de5bedb9f8352427686cd5ab5258d7fba8ba64216cc04729ba267a015019b8b1c63e948fc8f140224ffe7abc9d5cd2c867e6ff SHA512 751e15ed5a969ead2645ecb20db2761666c757f6d24b6053ae625d9901e926480a0a6ff209b5e800f98d1d2f4921d0f2e791c1e17ae7ed0b26aacab439f06079
-DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
-DIST syn-0.11.9.crate 62342 BLAKE2B 48513619cc2bb40e9ba713d7badd5bc35315de1cb467513288e3a62bab63d9aaea6a6a9c8cd5ce878027b67b4968b29c03b949eb72bf32b9798d7af1ae0cfc12 SHA512 5df6189f9a3ed0633b1941ecbfb71bac60837d577c5abe523172d9985c809d98d4732662bca7c5c44636ea4c3f23418af74e17238dd0506554a70b3f865f9e14
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST syntex-0.54.0.crate 4170 BLAKE2B 08197712b73cb2a002026e69ebdf22114edfef94bdb09bca40ff86f337062683d7ef8da680b0cb84f320455f038f7d9eab9c876b1ed05351517b6d77497d360a SHA512 ebeb722ebd11c0e87e2e7ae3b8adfff9e29f0057320a876d72aa1eb547c9b85097ee252f54561cfb84112b120a9c3bee93c082cc8a37bd307627d08f4dcccdaf
-DIST syntex_errors-0.54.0.crate 20743 BLAKE2B 9e0cd591d8bfbd5a72ed3f29f231e0b244386303e42def8912ba499cdee34a6ea2a1bf363701f2ed1fbba5a0f659dff1a2ab35739d6cbd286f61e621d8faaf0a SHA512 739ffd41122751af969c069e49fa82b8eb8a026c14e11364d37d71e168aeaadbdd692cd12a3bb3191eef1815e7022b38727863c90cfbe8739243e1e82d4014c4
-DIST syntex_pos-0.54.0.crate 7297 BLAKE2B ffee038458a16e615893f423c5388a20a14ae3ed616d0f192928d70be5cf59fc00b9d75d520ed66f15309287553882e04b9f45770efd8cb6292534e6d3869623 SHA512 8995a3e67fa391815868350f8043b37983ec7fc14654382191928c6033cd4334735cd49012b41cbc23661a120c35f1257f7d1f9147cc7cf3b65ada4228e32f71
-DIST syntex_syntax-0.54.0.crate 264005 BLAKE2B 58ca5bbb7baa6dbabc97d7c759ca8e560a39ad3296fc700e7122cfaab383009bff8bed66c543ed5e0ca188ebf54a214042cdecec0d00e7bd4103567f4038c170 SHA512 bb781bea73fe9ea2fa7d1865d573f311645da3a7d23aaaa2a4195ea10ec5aeae6ed0af3314b0e7c1bb1bbea344897ccf08ba251b907e9e4f7b30ed8cfac74f3b
-DIST target_build_utils-0.3.0.crate 7591 BLAKE2B 567955b4851aae82ef6b27b77ec772a9ce6272c61b76045126e8f05edd86580532f22cfaac819538f60d792bda5963add7c8aa53d2046e8b047138d5b45f250d SHA512 597e6f1ada25242d7c148ac662be31b0f878b54b73f10a36c1c7cee48567df6a00fce521cc57fd98c8afb1ac336b37ee2aac8ad36fdb3e5857b6eab8cef15c89
-DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
-DIST term_size-0.2.3.crate 9407 BLAKE2B 33b89bab0647b0e58b9c5375ab39069b94cad6b9b432d7e31f55269558c1e16613f89ef24d3f1731867ec430f9bcb221b16f4baa9227a618faf9e99e012e6075 SHA512 09a7e95e82c673b55b11acd18b9a7f9507247967f5ec9d8576aff91b2d64f68172cab8dcdd3a626c1d12edabee4f7b55c72db0d7eed3eb89d049e2cad4d59261
-DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
-DIST thread-id-3.0.0.crate 6240 BLAKE2B 50d203f52cf0116608c6ed92911f982779f7c2504e2e637bb9a67b2d8a2011888224b1f37bc5c81e4b6991eaa685f94dd9c596b654d827b5f2aa527be12a9690 SHA512 39d02053fc3b0f667e0a0e8d8dff26ab393d9fcedecf54541ff3cd5abd0fb25a445a4a72160e97fb36b137ca15f7e8e751cd8bc93d537d73b743049146e92bf0
-DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
-DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
-DIST toml-0.3.1.crate 54005 BLAKE2B 0cd9d68a3a12c723d31e4fbee27187012b6bf7cad042c2784a36b9a8cffc55e78346c50aee82a7e7bd2863098f4d570d4ac96c6a040080ba7bf3b167b7bfe7aa SHA512 5b605eb1d72a8132f2a1cd9005577eb24b1a93a597e69aed883a6069bec84138426cf7facdb922065dd57b66e5f6d7522a64a410d16fedf0394077b92103271b
-DIST unicode-segmentation-1.1.0.crate 65559 BLAKE2B f47ceef39a91927ee9d4ce9e21a542c1cdbb1b200127e0e8961befba58895f0ced017030ce21493c45b82e430ab9c9ccf46be0784148c3da87032d98007bb55d SHA512 1cac2212b05d196ef3109390a9fd902430d88f01a8df9a66367c2535ebc57546ba5a923e0b1262f9858ad5a6851e6aaf7eb22d20ffaf1ed77d38009e7af64bc0
-DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
-DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST v8-0.9.6.crate 24925 BLAKE2B 254095ff728b48265f785e85e864513044055e79c31aad7c9de8d73907a50c2bbfebba54a68b926bf590b78c369f4ed35e13eebd65f76f06165851ee41ba1890 SHA512 6e323da9db8e0c1a0b10dc9a47df81b04c97b3a2aa2da3908ee7f0ebd82e88eb1069f505dc56fcbfea6f9dd36ced54f1f434cbdd6876d7d06eda4beff26c6715
-DIST v8-api-0.7.3.crate 5941 BLAKE2B 65fed5ff71eee0b422c9fdba68b17cd7c24078c33b367dc6e03cd49ac818258fd41d83a3f6de50798484f066c287e570c6f28a52ece58a5469ab63df4a13fcc7 SHA512 0b079ed7629669e17e9d76a5596e6afc1508262f80d32866811589b0508e7dc7e5c5103de78de0db93e3238ab6fc1bed3333c15664340bd4c92cfa78e2e4d9c8
-DIST v8-sys-0.14.7.crate 12119 BLAKE2B 52492c766ae325a4619bbbee398e6726eb7f4fad33a65a88a7f47b0ce20805d4b5c3c8e93530de60387dd6d7fe251b244045425e56b27c72c6063223f9fd2889 SHA512 a67cc73634c065a57097a6f4a3cd242cc11bb1f3762b34a595b023ea981781d13a72f06e8111b06422fb9925a9b5a8d9fb067c18e6df89cd4c3934b919781d08
-DIST vec_map-0.7.0.crate 13455 BLAKE2B 11c03f332ee3ba7fb86cee22decb6990e4ec155d1a5ff0427911224d7c44e6c14a81d63ebadf5f0953caf1da67d4b35db2cefc70852afcad880ca9c2f83cc72e SHA512 ce4b3e1ed8a7846ff63dbef7051cac76232295c443f560d3c5f7b658a2123c7881c40ebfa90907d500d3e943beaf32b25c8a8068999ac7a28528db273f2e0983
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST xdg-basedir-1.0.0.crate 9720 BLAKE2B 96591a8491c9e86c1c0b568f80af42f1cb87eb41f34a71e3ca724379ec672041ef0c560ecdc7fac6076600fac303d0aaf793ee4bde103b861c52e3a1bfd188c1 SHA512 3641b7335095b72eb0701d1c287439556d92e3ffe230f61aa5b9e9cf4260e618f8e04584dfcff72ce4888688cffada1b29cf54b747ccb82e8737dadd9f40a30f
-DIST yaml-rust-0.3.5.crate 42087 BLAKE2B 03a1b273f9725fa991a1a1ca7060d879d333d44850f70d64acc76d03f3af08fe220ba9beefb8e6ff29a0958d5fe74d5f9780711ce9e5e3c4c18e8b41865024ad SHA512 0cc2a0f0b308e13c16bb2c3fc797eb1a0bcbfc285f0b42446359099c58a290a545d1589c09a2c779d5dde4f8c1f4261bc117f2df0359e281b995c7a115e5994b
-EBUILD rq-0.10.4.ebuild 2771 BLAKE2B 04fa98ee5ddc841f988af126b992add08f29bdf4a02e2bcda6af84b059c6e4f19017cfb84ee982bf7964f1287735184accbf1af1825f49c6df18e7dab8d7de9d SHA512 b71caffa51a4573e97156f0de9e87cf2fae23f15c448f3e74db24e1c4d345f66f1a98f04cbb1383f09bcd56af3c78a60dde64a84c3ec42726b7773f653c4dedf
-MISC metadata.xml 243 BLAKE2B edfd85a483c029fea3dd913114b1d609a8c9e204f092ad16e9bde97d759eee380a09504eab025fb0b6968582510b0cd84b89e6b9899ff6c46572135527f3a0a3 SHA512 a64f9a9ae8510bd3413ab61ce0525a628eb0c49ec21e9d3ed983ee06089f81e4804d730594a5b4701a650bbf7501ca82603152f65be4adf5edefa17eaa23f9c1
diff --git a/app-misc/rq/metadata.xml b/app-misc/rq/metadata.xml
deleted file mode 100644
index ac74bfaa4559..000000000000
--- a/app-misc/rq/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dflemstr/rq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/rq/rq-0.10.4.ebuild b/app-misc/rq/rq-0.10.4.ebuild
deleted file mode 100644
index 63e37a15cafb..000000000000
--- a/app-misc/rq/rq-0.10.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.5.3
-aho-corasick-0.6.2
-ansi_term-0.9.0
-aster-0.38.0
-atty-0.2.2
-backtrace-0.3.0
-backtrace-sys-0.1.10
-bindgen-0.22.1
-bitflags-0.4.0
-bitflags-0.7.0
-bitflags-0.8.0
-byteorder-1.0.0
-cexpr-0.2.0
-cfg-if-0.1.0
-clang-0.15.0
-clang-sys-0.14.0
-clap-2.21.1
-crc-1.4.0
-dbghelp-sys-0.2.0
-docopt-0.7.0
-dtoa-0.4.1
-env_logger-0.3.5
-env_logger-0.4.2
-error-chain-0.9.0
-flate2-0.2.17
-gcc-0.3.43
-glob-0.2.11
-itoa-0.3.1
-kernel32-sys-0.2.2
-lazy_static-0.2.4
-libc-0.2.21
-libloading-0.3.2
-linked-hash-map-0.3.0
-linked-hash-map-0.4.1
-log-0.3.7
-memchr-0.1.11
-memchr-1.0.1
-miniz-sys-0.1.9
-nix-0.7.0
-nom-1.2.4
-num-traits-0.1.37
-num_cpus-1.3.0
-ordered-float-0.4.0
-pest-0.4.1
-phf-0.7.21
-phf_codegen-0.7.21
-phf_generator-0.7.21
-phf_shared-0.7.21
-pkg-config-0.3.9
-protobuf-1.2.2
-quasi-0.29.0
-quasi_codegen-0.29.0
-quote-0.3.15
-rand-0.3.15
-regex-0.1.80
-regex-0.2.1
-regex-syntax-0.3.9
-regex-syntax-0.4.0
-rmp-0.8.5
-rmpv-0.2.0
-rustc-demangle-0.1.4
-rustc-serialize-0.3.22
-rustc_version-0.1.7
-semver-0.1.20
-serde-0.8.23
-serde-0.9.11
-serde-hjson-0.8.1
-serde-value-0.4.0
-serde_cbor-0.5.2
-serde_codegen_internals-0.14.1
-serde_derive-0.9.11
-serde_json-0.9.9
-serde_test-0.8.23
-serde_yaml-0.6.2
-siphasher-0.2.1
-snap-0.2.1
-strsim-0.6.0
-syn-0.11.9
-synom-0.11.3
-syntex-0.54.0
-syntex_errors-0.54.0
-syntex_pos-0.54.0
-syntex_syntax-0.54.0
-target_build_utils-0.3.0
-term-0.4.5
-term_size-0.2.3
-thread-id-2.0.0
-thread-id-3.0.0
-thread_local-0.2.7
-thread_local-0.3.3
-toml-0.3.1
-unicode-segmentation-1.1.0
-unicode-width-0.1.4
-unicode-xid-0.0.4
-unreachable-0.1.1
-utf8-ranges-0.1.3
-utf8-ranges-1.0.0
-v8-0.9.6
-v8-api-0.7.3
-v8-sys-0.14.7
-vec_map-0.7.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-xdg-basedir-1.0.0
-yaml-rust-0.3.5
-"
-
-inherit cargo
-
-DESCRIPTION="record query - a tool for doing record analysis and transformation"
-HOMEPAGE="https://github.com/dflemstr/rq"
-SRC_URI="https://github.com/dflemstr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> ${PN}-v8-5.6.222-x86_64-build.tar.gz )
-	x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> ${PN}-v8-5.6.222-i686-build.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-devel/clang"
-
-src_prepare() {
-	default
-
-	# point to bundled v8
-	export V8_LIBS=${WORKDIR}/v8-build/lib/libv8uber.a
-	export V8_SOURCE=${WORKDIR}/v8-build
-
-	export LIBCLANG_PATH=$(dirname $(clang --print-file-name=libclang.so))
-}
-
-src_test() {
-	cargo test || die "tests failed"
-}
-
-src_install() {
-	cargo_src_install
-	dodoc CONTRIBUTING.md README.md
-}
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 074834b7efe5..610284234d88 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,6 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
-DIST screenfetch-3.9.0.tar.gz 77670 BLAKE2B 9d5710f93d7e5614add98e303eee7bd13753af3aab8e5e266a09bd0a5a126d2056075364cff23428436953afd2bc840735362dad631f5001e08de797d2274fc7 SHA512 ff99dcf6f6276f54d88d05f6f6bdb82cd8c1e7e74befb60786993118c543550929090ba710142df7793112f7253dc415a031715bd6f85f2625260d281ffdc817
-EBUILD screenfetch-3.8.0-r1.ebuild 669 BLAKE2B ca0a711dc8bb9a75020635066cfe41b42c56a9027e6f537b79edd6c22e06641c9a8b4292da7f2c62462c62258e4e64c432a8ff2ab9ebf5b2a97ece10fbb27e6c SHA512 f09e0fc6e505d94fb1d6cc82081157ac8bfb40a9fb5e2e9c34a6dbae21bbf2b8ab57ac6832bcadad9c5b69b2f90260442c945803b7afd088486d60e56a157e4b
-EBUILD screenfetch-3.9.0.ebuild 671 BLAKE2B 2d008b74395244174537713a17b82aee64940f64b9a75d1a48188ae4b70ae00dca1b31f4fe8831b51e915c3d5a7f98813aa8daf264d2fcf8362110b39aebc332 SHA512 21b8540103086070383681811e5d3a7abecde478d6e1545d17a64e960899231a5ac115555e11acd0589fd176a4b79ff95f9e26c91b92dc3f697e8f59f475dc80
-EBUILD screenfetch-9999.ebuild 671 BLAKE2B 2d008b74395244174537713a17b82aee64940f64b9a75d1a48188ae4b70ae00dca1b31f4fe8831b51e915c3d5a7f98813aa8daf264d2fcf8362110b39aebc332 SHA512 21b8540103086070383681811e5d3a7abecde478d6e1545d17a64e960899231a5ac115555e11acd0589fd176a4b79ff95f9e26c91b92dc3f697e8f59f475dc80
+DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
+EBUILD screenfetch-3.8.0-r1.ebuild 698 BLAKE2B 19c4dc1b59b17d0857be792b7b4e853fb1a9e8c16740336a21c0d08dbe42d3aff0c3bb992b3fcb0fa03e6bf0476ccc0409cef440e74ec5faaccd99e4ea303774 SHA512 c446d204d054e4cb78aa0f2e6927b0bad2ed83304f825b37e433f22c0ec3f6f4dc0281048b99244cfe5a0b3310bddf10cc5adac54a166e2e2377be2d5b052bbe
+EBUILD screenfetch-3.9.1.ebuild 700 BLAKE2B 13008f0c79a4b427033b78d372455448d45bba1dc422ae3e1169e7aec4b50c67a58885d0242581f21b9bf6b0473758417b12f5cdc41e4c52adfec00c556ab6ae SHA512 d14d09879a624d86ba79dbae445210d1226c9c780a3406b44386eaa92bed24650048caa034d0e96e0e5d483aa569828f56459eeb5269f5deaec37ced133e414c
+EBUILD screenfetch-9999.ebuild 700 BLAKE2B 13008f0c79a4b427033b78d372455448d45bba1dc422ae3e1169e7aec4b50c67a58885d0242581f21b9bf6b0473758417b12f5cdc41e4c52adfec00c556ab6ae SHA512 d14d09879a624d86ba79dbae445210d1226c9c780a3406b44386eaa92bed24650048caa034d0e96e0e5d483aa569828f56459eeb5269f5deaec37ced133e414c
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
index 563bd71e8b10..5a74091728ce 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="amd64 ~arm x86 ~x64-macos"
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/app-misc/screenfetch/screenfetch-3.9.0.ebuild b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
index 09b465b4c1ac..552e3a0655c6 100644
--- a/app-misc/screenfetch/screenfetch-3.9.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 09b465b4c1ac..552e3a0655c6 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index 10878f6ee947..edeb70a03b91 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,5 +1,5 @@
 DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc2704454bd2b8871518a3d525d9101abd9f2ebb11171cb57937b598125b599371908c3b32800dfbd7aeda0fb SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201
 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
+EBUILD scrub-2.6.1.ebuild 388 BLAKE2B cc242146aab585229b79a6d87eb4c98486e69960df0d7e645c452126f8db257a933c788daba9acafdf68e560c0226d5ca45e0a34f31fc7a430e05f421b02e723 SHA512 48ee44abe9e819d1b555901dbb0ca8d3164ecc30cf1d058bfc1874c46c43fe12f168212d5d508e78e34ca1e10a6c5c6c5a0e2ed76818a19f0138028d48f345b1
 MISC metadata.xml 427 BLAKE2B cabf19dba485a1ab72e0500c58039417e3d43a16221200a291fa24ccf071592bd6fc4360dcacf03f56242a3a218a4783e4f716253056384dec0da2dd60831b6d SHA512 6df40e1c7f4e9a5dff97a24cac6e0ec70ef4932846de7499be62bcd9bad40c5e23cfe23aac3672f1c9de4aadd36b6abcf96945cd8bd6c58a87ee91f793e0a627
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 654963361fc9..0b050cc0eb25 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index edffed03fdca..be402806176c 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,4 +1,3 @@
-DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
@@ -35,16 +34,13 @@ DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed
 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
-DIST libc-0.2.50.crate 392277 BLAKE2B 75a8fd5babba55fe59e3ecb49941c313dccc780f8f2d0c521e14e3bb63494090e919111b908b928c4048c0458095da5a48ebce90171831931a972c20b3de758c SHA512 36a51f7925a1a4e670ed8783f63d7f2ab85d1382d0be29ab4fbf0d66b24e7d68d88bb9e320e9dff35a1e275c07afe672dd164d12cc2af8ee1bb57ef6d2aa4a30
 DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
-DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
-DIST nix-0.13.0.crate 176804 BLAKE2B 4aec3245a1812d0db51b77b65f1a75f039797672f5929d8cf02200a4f6c56f432d6fe9bb313ee160acc86ab7aab59f8e5ef83f25d45a1e024f6e93d24d5feb22 SHA512 6345871b599ea0c4482248d0ff98953e4976d5af85d596d8a1ef739c661e54734f1379f3a6c41162a9e2b8eff1d9dd9a9e3fdef6928ba21eb855bd369a278752
 DIST nix-0.14.0.crate 184529 BLAKE2B 106c90d03a9359608d99f8356239623a8b983dbabf92d170c19ca05b3eb035bf10749a9bc45e43d014b946c857eff5435aa1a02ae23e3f01a2baf7fab8bc22ba SHA512 34e900f3119d62ac00fd2d8ef001bfd7474bafd8415ba9986562a943eac292f2c9a679dc27e9b09d26d04c1e020bd88ec87689793f78b7b5c45ba21d29510207
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
@@ -58,21 +54,14 @@ DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2
 DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
-DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde112b9c8b4dde08780d7d50cb8bb4ec2ef555df941be4e89f1f3aa49b335e640702bf8b10e609d6cfba211 SHA512 018962a728b9729b51afdc8975cddeceec84731f43b776a740ad2b4d2a479ceadd7a4d45c6eb5389ef73cdf18955a74ac85e9bbb4ad823e4d4a5d9972a4aa19d
-DIST skim-0.5.4.tar.gz 87040 BLAKE2B c7816dae5142d3230bf98db7c86ec8b8d78adac52dfe19c6760d65b6ea81e704f84c4127c9ca1d74812ddef69595290a8f09f01869a41dc17a42a33d2eedb15b SHA512 f21af6c86ca6b1c4aab1b715c1c47ced1d06c45216a03493cfc3f01d7ed6ecb6e287a335d0756f4b82b97d4d22493b01598569a0529bc57983a5a4716427af83
-DIST skim-0.5.5.tar.gz 87411 BLAKE2B 98dbd5d8f5d45a0752975316aa41971622e6d65e91dbfe9c8248882931d05dcfb0d8ab32fc51504060fd41aef7c456c8f753e2939a726ad41cd3b82515adeeb1 SHA512 a6970252633e32004edc4e4cf910a5d07d1a63b11b77e56d5ddc6ad656d33ea984dc02523fbfaf5eeb58c197d95a17fb6bcdf16448d68c6a239798b3180d7aa2
-DIST skim-0.6.4.tar.gz 85922 BLAKE2B ddf8a64bf3e7daca04bea7e0a208b9acf7e336c299ac3e524bff081f55b103b431d8f35790265222d36ba26abe9e0377cf6c748af81739d42fb2a0b82a40f6f7 SHA512 1aaa10158cae58d2fcd0a2c25c03699ef63cf6d2ae94adba5988259c5be23eda5837b22c45643904e96bd095e8ad6efb48c7c36ffb3db14492773e71fe9d66e6
-DIST skim-0.6.6.tar.gz 86665 BLAKE2B 5e89507ab76d974bd0925aa273565eae0f9e7783a18a84da6083d28ac13394ace48123cc658bab6065c0fd4f46a2e96469ac990ef58e6a0391e740825095581f SHA512 df4c8c9a3641321786e014f63d1f1bc4b15762d666792d3f8b86e73704c15643ca01e3f6242243eb903454cc7c8e983255583b1cddc39cfdd5e779c00f1a546e
-DIST skim-0.6.7.crate 84440 BLAKE2B 8d941d790071b3c2b310dc7a407b5e58b5f482637ee97aebad34052141799cf3b074ef415d9806d2d25701082ca195088d59f8d3ed9a19492cb1084d36fc52da SHA512 273337fcf6e46eff99f10b4a6eef7a66e215db0e0632531b5bab7bec4087f283dfb2bbcfcfb45613bedb94b208235f7f7acbadc1c2008c46ede7c64125f938e9
-DIST skim-0.6.8.crate 84742 BLAKE2B 1211bc10cc8cffb65335eaa7b9d299d243a38f042aeec971c8988c4c33d9300a6c6ff2d1f029b5b55032c272c720c18e5b69729a7d27a89e1ef0f129576444cc SHA512 124bcddf623890521b1fcd39b022303b021a8396d9049352725c02bbba8a90d8c3611bb519bb2072d767954eedfc9b81af74642eaf4378f334f374d46ac3dad2
+DIST skim-0.6.9.crate 85410 BLAKE2B 6b06657896f6959c4ea0882e99c4ecf29b485fdddbcc9b7313753e5557e42ccd786e107327aeed5485785cab001d0586059017492f1d3d7e4eeba443817c7312 SHA512 28619820fa564906a8b13d587a484055dc540befd509668e05d181888412c66530039c4cc2e5d9ad872b15b757e1f836d0503559b91eb77b1a9caed435b17d80
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
@@ -86,9 +75,7 @@ DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78
 DIST time-0.1.38.crate 28500 BLAKE2B f0d98a7288616c2a5a07691e6bfe2bed5b043c9ddec3a6658e2e1dde294af030b635aba1d8c408f0cbe3c4c2692d4e2705d91276fac0c63f5ca03d3be3b19b59 SHA512 9052d6bc6c9222d331d23f7cb79b534bea6b1cc0f259c97f465321bcdad11b643cbd2e9bb3a456770a19a2a84dabfbab55e522cbb745f4c64e228736eaaeaf24
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST timer-0.2.0.crate 12190 BLAKE2B 51a84f110fa814a9d844bbc7b81cb68f931e85a1a73f437874b0915458b539b27e90fc6872594f882d2f3d88117f605982c21129dfd2ada105ce207504758b8f SHA512 631997776e6b3d7e7abb4d42b7a4cbb12c3ac4337a11ed2cd83d783ee732b56ef27fc0bdf4156dca331494029b8c207d3c8df6936278b6eacd23348c44a4d757
-DIST tuikit-0.2.4.crate 33957 BLAKE2B 3fa1eeb5ac69e0754ada795f79c4c487b5dd4477af57d20c526b8a8f79b586b9de0ec1038cacc7d103b1947ea2cf034658b741c4670acd6a5582a49dc5afd3e0 SHA512 1020e264eb63bf966cc34dadbf74d19e752752f53f07a6148c79310cb5d0cb33f1d57566c2e72dff005012eaa62b02c673ff69ac857805fe28af4e7648c18ac4
-DIST tuikit-0.2.6.crate 34499 BLAKE2B c957c6b14c91567a06ce6fa5249438cb2cd7c767d111190c4d4fabf9587644d89500ad8beb49df02dac1acf581122f5bbb273fb8fb4e62f60e50f64e19e8c399 SHA512 6f468ef533815f352e2002d743efdc82be2dec9a3ae86f01fd22d1a9f8bc59082f8fb4ded73f1d8a94206beb97445c1d4a21ae742be2646d256874807709519a
-DIST tuikit-0.2.8.crate 35021 BLAKE2B 506e0c8cd7d301c532100c28838d404c27be7513ee5aab1fd5957fd68009cd0981b84a4ef78fa47dd59bf2c9572a0309bec84e602be19974713a010d55e2db0b SHA512 59f4a97b6322fe291cfe8ab4bda5ad380e6d227be0315205512c512584a85628b6ee4904ee0990944ca3078385dd8e56774e19a4d89f28bf178e7259adb875bc
+DIST tuikit-0.2.9.crate 35141 BLAKE2B 0ade82741a12b9fb094d3c56cd2d5efae093663fb6f52156f18e5777ee556e7521cf98849dc03b88e46d0ceb3cc253afe218708346914960a1a9a371dfe15bec SHA512 33568432d0c38f77b6102c27a5fe2a654c6772afaa442b021e4d29c181573e4d22b323fba642f6e916eba5968733eb422ec1dd24bf3748dbc4158a53a1bc5f86
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
@@ -109,10 +96,5 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 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 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
-EBUILD skim-0.6.6.ebuild 2059 BLAKE2B 7336f85a6e335a049c33c415fb2d3522fd38335bb8df16c3bbba5aa06b351e7d37caec6cf6a9368572b4e25652ef62cdbc2cc3e3e2db53a4712df9f8dc2cfa41 SHA512 58dc196e36edc43b5d8c4e793e0ecd3be72d9ba92df5b901eaca3ee558e64db48f3992116f595cf59334e47d3b42ab8aa8fdd83f5a01482a380fb5c18e2a1838
-EBUILD skim-0.6.7.ebuild 2059 BLAKE2B 5be72c371d268e4efddc4e12c96f989c972c3a7c9417924645acdd3972f05b519b11a4ac115ce393744a6878303400e0d21eebb7613678aac946c1743f6d511f SHA512 7ed306f4334480e0075f33d712a00bc83669330c0ef3b9362488e9bac18e9fac27b63c0f63f9fcd2724d9b56e6ab9934ce23b7f368f29cd88f1adcf97958621e
-EBUILD skim-0.6.8.ebuild 2048 BLAKE2B c4a91c9f879196dcb06af472774d11cb28fbd99f5d4fbfcbb6b104aec9c19a57847ca851a4f16a4a47274147b3ec686b8ed66a192e4ec8ec111d6b4d6f113ee4 SHA512 2b7e69f7e2a4381a04373c59bcf06dd0d7f5fe0fc220338689fa85ab78c1605068931b4c678b1df7bc0c6c9c1998cf22a2b0b6367635f138519750a42717f895
+EBUILD skim-0.6.9.ebuild 2075 BLAKE2B b667466ef1cf6da5c3df40860974026bc3bfca0460eba9298cb8bbaa6dbea3428028c85ce4e5049c704322092b7744d7eb9b559e2adabcf062a91be295cb176a SHA512 54c479180d3aeb6a56c1706798edde0de09e33a88d361da57a019976ac88c9576fc1a1510206622d4d4f2994c0baa43a5f8f22a73456c44ac2b77ff75b21ce3f
 MISC metadata.xml 475 BLAKE2B 7cedec92f0fd023020c46b70a096c172b014b853265f8ff62a7623edfac33f106ecf524e18fdeb2812a9cdbda55dc6788993d816f3de7f04f863e03843cade3d SHA512 8f6fbbc3bf51c5614b3c3c7028193d01892d517bb3cc86a44e56129a9b342a62c8a30d27911c7741dddfa583ac14e20922ddb3b421824cc16c0f734cf4c1a39c
diff --git a/app-misc/skim/skim-0.5.4.ebuild b/app-misc/skim/skim-0.5.4.ebuild
deleted file mode 100644
index ea4eeca24d46..000000000000
--- a/app-misc/skim/skim-0.5.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.4
-ansi_term-0.10.2
-atty-0.2.3
-bitflags-1.0.1
-cc-1.0.17
-cfg-if-0.1.3
-clap-2.28.0
-env_logger-0.4.3
-kernel32-sys-0.2.2
-lazy_static-0.2.11
-libc-0.2.42
-log-0.3.8
-memchr-2.0.1
-nix-0.11.0
-redox_syscall-0.1.32
-redox_termios-0.1.1
-regex-0.2.3
-regex-syntax-0.4.1
-shlex-0.1.1
-strsim-0.6.0
-termion-1.5.1
-textwrap-0.9.0
-thread_local-0.3.4
-time-0.1.38
-unicode-width-0.1.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vec_map-0.8.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="a command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
-
-DEPEND="virtual/rust"
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	cargo_src_install --path=.
-	dodoc CHANGELOG.md README.md
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.5.5.ebuild b/app-misc/skim/skim-0.5.5.ebuild
deleted file mode 100644
index 37e18dab525f..000000000000
--- a/app-misc/skim/skim-0.5.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.4
-ansi_term-0.10.2
-atty-0.2.3
-bitflags-1.0.1
-cc-1.0.17
-cfg-if-0.1.3
-clap-2.28.0
-env_logger-0.4.3
-kernel32-sys-0.2.2
-lazy_static-0.2.11
-libc-0.2.42
-log-0.3.8
-memchr-2.0.1
-nix-0.11.0
-redox_syscall-0.1.32
-redox_termios-0.1.1
-regex-0.2.3
-regex-syntax-0.4.1
-shlex-0.1.1
-strsim-0.6.0
-termion-1.5.1
-textwrap-0.9.0
-thread_local-0.3.4
-time-0.1.38
-unicode-width-0.1.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vec_map-0.8.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="a command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	cargo_src_install --path=.
-	dodoc CHANGELOG.md README.md
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.6.4.ebuild b/app-misc/skim/skim-0.6.4.ebuild
deleted file mode 100644
index 7eab30978e94..000000000000
--- a/app-misc/skim/skim-0.6.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.10
-ansi_term-0.11.0
-arrayvec-0.4.10
-atty-0.2.11
-bitflags-1.0.4
-byteorder-1.3.1
-cc-1.0.31
-cfg-if-0.1.7
-clap-2.32.0
-crossbeam-deque-0.2.0
-crossbeam-epoch-0.3.1
-crossbeam-utils-0.2.2
-darling-0.8.6
-darling_core-0.8.6
-darling_macro-0.8.6
-derive_builder-0.7.1
-derive_builder_core-0.4.1
-either-1.5.1
-env_logger-0.4.3
-fnv-1.0.6
-fuzzy-matcher-0.2.1
-ident_case-1.0.1
-lazy_static-0.2.11
-lazy_static-1.3.0
-libc-0.2.50
-log-0.3.9
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-nix-0.11.0
-nodrop-0.1.13
-num_cpus-1.10.0
-proc-macro2-0.4.27
-quote-0.6.11
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-0.2.11
-regex-syntax-0.5.6
-scopeguard-0.3.3
-shlex-0.1.1
-strsim-0.7.0
-syn-0.15.29
-term-0.5.1
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-time-0.1.42
-tuikit-0.2.4
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="a command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install --path=.
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.6.6.ebuild b/app-misc/skim/skim-0.6.6.ebuild
deleted file mode 100644
index 406e8b4abca6..000000000000
--- a/app-misc/skim/skim-0.6.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.10
-ansi_term-0.11.0
-arrayvec-0.4.10
-atty-0.2.11
-bitflags-1.0.4
-byteorder-1.3.1
-cc-1.0.31
-cfg-if-0.1.7
-chrono-0.4.6
-clap-2.32.0
-crossbeam-deque-0.2.0
-crossbeam-epoch-0.3.1
-crossbeam-utils-0.2.2
-darling-0.8.6
-darling_core-0.8.6
-darling_macro-0.8.6
-derive_builder-0.7.1
-derive_builder_core-0.4.1
-either-1.5.1
-env_logger-0.4.3
-fnv-1.0.6
-fuzzy-matcher-0.2.1
-ident_case-1.0.1
-lazy_static-0.2.11
-lazy_static-1.3.0
-libc-0.2.50
-log-0.3.9
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-nix-0.11.0
-nodrop-0.1.13
-num-integer-0.1.39
-num-traits-0.2.6
-num_cpus-1.10.0
-proc-macro2-0.4.27
-quote-0.6.11
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-0.2.11
-regex-syntax-0.5.6
-scopeguard-0.3.3
-shlex-0.1.1
-strsim-0.7.0
-syn-0.15.29
-term-0.5.1
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-time-0.1.42
-timer-0.2.0
-tuikit-0.2.6
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="a command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install --path=.
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.6.7.ebuild b/app-misc/skim/skim-0.6.7.ebuild
deleted file mode 100644
index cc50f91bb4d3..000000000000
--- a/app-misc/skim/skim-0.6.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.11.0
-arrayvec-0.4.10
-atty-0.2.11
-bitflags-1.0.4
-byteorder-1.3.1
-cc-1.0.31
-cfg-if-0.1.7
-chrono-0.4.6
-clap-2.32.0
-crossbeam-deque-0.2.0
-crossbeam-epoch-0.3.1
-crossbeam-utils-0.2.2
-darling-0.8.6
-darling_core-0.8.6
-darling_macro-0.8.6
-derive_builder-0.7.1
-derive_builder_core-0.4.1
-either-1.5.1
-env_logger-0.6.1
-fnv-1.0.6
-fuzzy-matcher-0.2.1
-humantime-1.2.0
-ident_case-1.0.1
-lazy_static-1.3.0
-libc-0.2.50
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-nix-0.11.0
-nix-0.13.0
-nodrop-0.1.13
-num-integer-0.1.39
-num-traits-0.2.6
-num_cpus-1.10.0
-proc-macro2-0.4.27
-quick-error-1.2.2
-quote-0.6.11
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-1.1.6
-regex-syntax-0.6.6
-scopeguard-0.3.3
-shlex-0.1.1
-skim-0.6.7
-strsim-0.7.0
-syn-0.15.29
-term-0.5.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-time-0.1.42
-timer-0.2.0
-tuikit-0.2.6
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo
-
-DESCRIPTION="Command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install --path=.
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.6.8.ebuild b/app-misc/skim/skim-0.6.9.ebuild
index 0290b225d1de..c5c1eb4ea51f 100644
--- a/app-misc/skim/skim-0.6.8.ebuild
+++ b/app-misc/skim/skim-0.6.9.ebuild
@@ -49,7 +49,7 @@ regex-1.1.6
 regex-syntax-0.6.6
 scopeguard-0.3.3
 shlex-0.1.1
-skim-0.6.8
+skim-0.6.9
 strsim-0.7.0
 syn-0.15.29
 term-0.5.1
@@ -59,7 +59,7 @@ textwrap-0.10.0
 thread_local-0.3.6
 time-0.1.42
 timer-0.2.0
-tuikit-0.2.8
+tuikit-0.2.9
 ucd-util-0.1.3
 unicode-width-0.1.5
 unicode-xid-0.1.0
@@ -81,9 +81,9 @@ DESCRIPTION="Command-line fuzzy finder"
 HOMEPAGE="https://github.com/lotabout/skim"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="tmux vim"
 
 RDEPEND="
@@ -97,7 +97,7 @@ src_install() {
 	# prevent cargo_src_install() blowing up on man installation
 	mv man manpages || die
 
-	cargo_src_install --path=.
+	cargo_src_install
 	dodoc CHANGELOG.md README.md
 	doman manpages/man1/*
 
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 32d0efbf0bdc..67bafada3cc6 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,5 +1,6 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
-EBUILD solaar-0.9.2-r3.ebuild 1337 BLAKE2B da7b2feebd9fb7558c3f793113c25a13788b36cbdaadd38c68cc86c972ab56cd8d19c151e1ed5df005d6c2f98c7d590471f1ee2485d7cc569ce645fba863a73a SHA512 0fd7b6581d925419aeaa8f0fe67c35d4a83b9ffc2a16a3bd81d61c8034f5a872e7288ce722df139e3fffebf7183eef28c5d877658b114e0009b8534c725d45ae
-EBUILD solaar-1.0.1.ebuild 1103 BLAKE2B c56a6f91c846131ffd2c397689472f29ffa745a8403713a5af675623e8d8935752a16828984c500fe211629725305f1d9a2f2066559bdea13935244ceb8ea51c SHA512 33727e766ed85f3234c0904731bb1ef7ff40a38b27bae6948e1c419758796c8f4ee84f469dadc8733542e79c2f09dae04c7be82ab9af7392f55cbc8cb2a08b1e
+EBUILD solaar-0.9.2-r3.ebuild 1333 BLAKE2B a97c2ee886168dc4c46170e31d961bb2ce642b7d8831c4244652b04851d61e3e75f905701e1069354b9ca37924783f3fbdfa7f84b14553cd5a3a2f56498ea7e0 SHA512 f483ed000e628edbd1a9a4e25e1101f124bb9e9b2d34395caedf88730a15925d090aee57ae153f7fa9373ad409b9e42f41b4173930caf3e7fce5c0e230042a2f
+EBUILD solaar-1.0.1-r1.ebuild 1132 BLAKE2B 66b922175136ef89eb1a2cf0d0af1adae86f9587772659cc5b56cd3af4e172ecbf71001c84d44905616803b860ab65d8ab56724e546ffb4b69b926e57e72b51e SHA512 f1df0f35328ecbf3939ee02412bc7e4c5a97d49406f0d39abc08d8b806b9e684632600cc4e0f378afd2f3dff42dd9b5dd3d94181d8e6259084196516c4b0ed5a
+EBUILD solaar-1.0.1.ebuild 1101 BLAKE2B b242e82b57630c733d26c0db2c3dd7a1186614e094b99eec3118fcdae580206ca827cb1b7d92da2cbe3df140868ef403e72461ddb0e807e5a60624146976a7db SHA512 ccd896cf0b62bb3254428680170c03812eaf5abf0ca30d890ca1f58b2b3136136a5e8621b76f2e7bbf1af4e1118aa955f48fe345813bb64ef46cfb21ac7f6f91
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
index 55fc4c787a27..f86d079462fc 100644
--- a/app-misc/solaar/solaar-0.9.2-r3.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 udev linux-info gnome2-utils
 
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..e81e7cc244bb
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+RDEPEND="
+	acct-group/plugdev
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+
+S="${WORKDIR}"/Solaar-${PV}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i '/yield autostart_path/d' setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	udev_dorules rules.d/*.rules
+
+	dodoc docs/devices.md
+	if use doc; then
+		dodoc -r docs/*
+	fi
+}
diff --git a/app-misc/solaar/solaar-1.0.1.ebuild b/app-misc/solaar/solaar-1.0.1.ebuild
index 399bbca7d482..d8ff31e25bfa 100644
--- a/app-misc/solaar/solaar-1.0.1.ebuild
+++ b/app-misc/solaar/solaar-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 linux-info udev xdg
 
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
index 3663a974cb0b..2c2c8617d39f 100644
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@@ -1,5 +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
-EBUILD terminal-colors-2.3.ebuild 614 BLAKE2B 64796649e7910a5aad79c67a74a01c6a2ad37f14ccdfd0abb7d2c9b18ad964d04117e8b81ab5170437930192d1361ff2eaba5df39d3479fdcba85b324bf0c5c9 SHA512 4f5f431496100c6800609036d633f41b142397269761f83e3734a26ef63478ed60ceb1ff1409033dd746f943799ab250b6433b0ac8828de28c0b42467a314e7b
+EBUILD terminal-colors-2.2.ebuild 601 BLAKE2B 7f15dbd64104c70387e13b1f622f662adf2e35fbf11e2dbb334ed74657ba466c1b3bb56c5f3e91a89bad027a78396e283a5fd726457b6390dedaac9cee506abb SHA512 f30566b2cd21c03a3c0a78136de5dfbc3a8e98a765eafc3362afb8ed8e602d52a0b4505120113b6635d5b0c35c9a82eb394e05d2ce954527d6a30a44a49ad5e3
+EBUILD terminal-colors-2.3.ebuild 610 BLAKE2B 0d20b69cdcf66115e1b2f4cc9482635987f400fe7bc1f7c6f534f918e461652aa4f68a44a6ed9035434d44f9009f3b9c9962017574ab92780efa100065966245 SHA512 3b967747ef7b68f197c80563e004859006170073aa5e2ce7692d4d275bc959f8dee73c0753c4435b1fb4635d05e43c80735fce34e319d53992e0e42ca0ef9885
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/terminal-colors/terminal-colors-2.2.ebuild b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
index 39936ad142fc..f4be1a1c37ab 100644
--- a/app-misc/terminal-colors/terminal-colors-2.2.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
diff --git a/app-misc/terminal-colors/terminal-colors-2.3.ebuild b/app-misc/terminal-colors/terminal-colors-2.3.ebuild
index debf5805c359..9da28944a841 100644
--- a/app-misc/terminal-colors/terminal-colors-2.3.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
index 8961c6781b02..2e97ae27b772 100644
--- a/app-misc/tmux2html/Manifest
+++ b/app-misc/tmux2html/Manifest
@@ -1,3 +1,3 @@
 DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
-EBUILD tmux2html-0.1.11.ebuild 501 BLAKE2B ba7f0555e55e03964b627a70911c2de450e14247c85b80e79cb266b5776558131d89f8626326b8c01c353e0275e084773200d86aed4380821f2cfd732661d1b9 SHA512 2d390b1f2ae11c0e50b15b45b6545f43af6f5db29988970a4e48304972976655d30fa0bab47532911ee755b5c01c902ee7412acaf31ef5766cdfb81ae0070bfc
+EBUILD tmux2html-0.1.11.ebuild 497 BLAKE2B df1949687073c8c168a25c4a5de7ac21e04e79c8261e938a7b640975beddc7485aa8098881240f18d1ecb8e7309474c3d2299d17ee8a22430761ec0d623b7ecc SHA512 c73a51bb3d30f7a19d1db203cd0f35fdddec855d860a80696445d4162a60bd4bc85e9fa77d730a0765a140584baf187b1786a991c46e10270950294ff783fd2a
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux2html/tmux2html-0.1.11.ebuild b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
index b0003570a855..ee0c7d963a3e 100644
--- a/app-misc/tmux2html/tmux2html-0.1.11.ebuild
+++ b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index cd3527394422..6c2f4cf77028 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,5 +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
+EBUILD tmuxp-1.5.4.ebuild 971 BLAKE2B e24a14874a855aa471e93b11db24a43c34dd7d6f22d9f5af9ad6d4e78cc3ecd5c8d15549e10babfd2243b8c84c954f3a90619dc5395f92bc31ff5bd9bc8bdf51 SHA512 22aad9f22f82384905d9362d12b8a7a87f6ebcac7a0420f861f2e7e8fe18cba428ad88f5bdd9c386af6854634894c0c9a2fbad999d2028278cf9f0d24d9b4ea9
 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
index b801bfdbf430..9c0ad7deae68 100644
--- a/app-misc/tmuxp/tmuxp-1.5.4.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 04d0e48a907c..3f551f0ff20f 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,6 +1,3 @@
-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 4622 BLAKE2B 889dab1b86e580ef8280cbea89c72b0c7903a121f3fd4bca1e1bcc61d5d8a8ef4640cdfa65c8c7644f9143878870b143f1989eeb0aedc7d7873ccdd086dce495 SHA512 87cc80f861097b93aaa13690d8dc0323c122a954a930d0372297695d463e9f19c7e69d232e735b9af171762661919881bba61c463e2367cb0f3abe58b9a70a2e
-EBUILD tracker-miners-2.2.2.ebuild 4695 BLAKE2B df24bd5e644d8b287c3f16c2b7543716c4cec48dc8abdfa6eb059adf3516b2db630c7bc9e208e92d8b4eb51635626078475e3ae1e497c234937cab989bd66887 SHA512 e0c4fd2b8d78983068cbbbbc9fb496a31b5645f76276598f715183a4ee7ef60addebf8272c0f8660aa9b3314073aff39b62ae9492749499a06034105949b480a
+EBUILD tracker-miners-2.2.2.ebuild 4691 BLAKE2B d1ed0be0579c342940c2c648d1edfadbb1799ca02657ae601fd8450920cf709ce023a38dddba5e3275dbe9890498d1335469ec6a4d7a056def013fb470ecaaf8 SHA512 b2eaee0f31dbd69e5fa6c564bb70ead1e045380cb33253aceab83e4e98990552dd92dfff8bf7385f7d4fb29b7d3c2cd2f5f283390a608f8662244a35c458e3c4
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
deleted file mode 100644
index 07d6ae9b649f..000000000000
--- a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ernestask@gnome.org>
-Date: Sun, 7 Oct 2018 11:40:41 +0300
-Subject: [PATCH 1/2] build: Fix libcue version comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It currently performs a string comparison, as opposed to using
-version_compare(), which leads to results like
-“unknown >= 2.0.0 == True” when the dependency was not found.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
-
-(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4273638dd..c30ada4ed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
-+conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-
-
-From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 7 Oct 2018 23:42:28 +0200
-Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found
-
-Commit 6e281037a5f0abc introduced a regression on systems where libcue
-is not available.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
-
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c30ada4ed..28072646a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
deleted file mode 100644
index 90a3454283d0..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg 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
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.1.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	!gstreamer? (
-		ffmpeg? (
-			libav? ( media-video/libav:0= )
-			!libav? ( media-video/ffmpeg:0= ) ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	flac? ( >=media-libs/flac-1.2.1 )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	taglib? ( >=media-libs/taglib-1.6 )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
-			media-plugins/gst-plugins-openh264:1.0 ) ) )
-"
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-cue-meson-fixes.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		-Dminer_apps=true
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		-Dcue=$(usex cue enabled disabled)
-		-Dexif=$(usex exif enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dgif=$(usex gif enabled disabled)
-		-Dgsf=$(usex gsf enabled disabled)
-		-Diptc=$(usex iptc enabled disabled)
-		-Diso=$(usex iso enabled disabled)
-		-Djpeg=$(usex jpeg enabled disabled)
-		-Dpdf=$(usex pdf enabled disabled)
-		-Dplaylist=$(usex playlist enabled disabled)
-		-Dpng=enabled
-		-Draw=$(usex raw enabled disabled)
-		-Dtaglib=$(usex taglib enabled disabled)
-		-Dtiff=$(usex tiff enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dxml=$(usex xml enabled disabled)
-		-Dxmp=$(usex xmp enabled disabled)
-		-Dxps=$(usex xps enabled disabled)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
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 57379e3ea6c7..9541f9757a22 100644
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 12b3444a85b0..6ea1c5071f46 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,10 +1,3 @@
-AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c
-AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
-AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
-AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
-AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d5235f44ca79927aacdee83987b74196433106c26194134651d2fc44e97ea02dc91c565b43322d07f7a1dcb36b0c5ea84 SHA512 7d5940f240b6bbf62e248b165835ae08f95edf9038cc761bb972f756a1870f08d8cde1841cf3830dce0a3ec09d95cc6d24d54b603b40856dde614bbf3886dd84
-DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
 DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
-EBUILD tracker-2.1.8.ebuild 3048 BLAKE2B f527d63e3ec0329a3f8cd4aea893d75af331ffb1e6a7f1917eea077c3315d2f4ec015c6a5f4e73923eea906bc865ad5d05a9ebb1a32d5437780d79c673b2dabe SHA512 2ecbbd4d9132ea0ed5ea344e737dac175ee257f167227bf5dc8526f0f5b5b1bfe1b85c534e469eef29db79abdd8dd0dc5ca876858d8c4e0f15ea63293cbd6bb5
-EBUILD tracker-2.2.2.ebuild 2592 BLAKE2B 16cb0024230468772a77a92eb998a840cec74b2eb5dba6979fd1a7266863096026186f89061b9fb59241295e8c0a87caf982942cc61d21cc3c8b2b3620877cac SHA512 75d1d2d562abe94723f67ea16ade9975023a5068daf87e93ae57bc3cb420e7d5b1b71e45f467b7cc4a84c29d76927199e809d56c685aa1d45d992638cfedf1e3
+EBUILD tracker-2.2.2.ebuild 2590 BLAKE2B a50bac85eb9d02d14428ccc3a2f596a95c180c980ade8c51b1aae5669db2c19810bbdf080a2a02e8ed35bbeb24d847740de58595f10eda5c8874ebf3e90cf9a2 SHA512 5d4ff9bd28033bc3f7070a884516cfa0eadb984398513eae597d227d75222e18bb68e8248caadf5ec1ac7743bc18678a6df80c777f364e7cda918b1b4279cdea
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/2.1.8-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch
deleted file mode 100644
index 9b25349f659f..000000000000
--- a/app-misc/tracker/files/2.1.8-doc-options.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From cff7f988fd2ed7894c3d16144e799d994637d3cf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 13 Feb 2019 12:28:53 +0200
-Subject: [PATCH 1/5] build: Separate options for manpages install and gtk-doc
- generation
----
- docs/meson.build  | 10 +++++++---
- meson.build       |  6 +-----
- meson_options.txt |  6 ++++--
- 3 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index 76e59797e..5e1d541bd 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,3 +1,7 @@
--subdir('tools')
--subdir('manpages')
--subdir('reference')
-+if get_option('man')
-+  subdir('manpages')
-+endif
-+if get_option('gtk-doc')
-+  subdir('tools')
-+  subdir('reference')
-+endif
-diff --git a/meson.build b/meson.build
-index 7d61fe1a7..0fda24151 100644
---- a/meson.build
-+++ b/meson.build
-@@ -320,11 +320,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
-                                                            define_variable:  [ 'libdir', libdir ])
- 
- subdir('src')
--
--if get_option('docs')
--  subdir('docs')
--endif
--
-+subdir('docs')
- subdir('examples')
- subdir('utils')
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index b36ba1d1e..0eb48aac4 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,11 +1,13 @@
--option('docs', type: 'boolean', value: true,
--       description: 'Enable the documentation')
- option('fts', type: 'boolean', value: true,
-        description: 'Enable the Tracker full-text search feature')
- option('functional_tests', type: 'boolean', value: true,
-        description: 'Enable the Tracker functional test suite')
-+option('gtk-doc', type: 'boolean', value: true,
-+       description: 'Generate API documentation with gtk-doc')
- option('journal', type: 'boolean', value: true,
-        description: 'Enable database journal backup mechanism')
-+option('man', type: 'boolean', value: true,
-+       description: 'Install man pages')
- 
- option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto',
-        description: 'Enable connection detection through NetworkManager')
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
deleted file mode 100644
index 85ddb6baa22b..000000000000
--- a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d52a7bed9fdeef77bdcafd66c748adce14fde42d Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 6 Nov 2018 07:11:37 +0000
-Subject: [PATCH 5/5] build: Restore right soversion to libraries
-
-The previous change did not leave the expected .0 symlinks.
-
-'soversion' is the actual version linked against. To match the scheme
-used by libtool, we need to give the libraries a 'version' as well.
-
-(cherry picked from commit 282cd5aa85852cc7f9e603dae435f6b528c4712a)
----
- meson.build                               | 3 ++-
- src/libtracker-control/meson.build        | 1 +
- src/libtracker-miner/meson.build          | 1 +
- src/libtracker-sparql-backend/meson.build | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0fda24151..593b9db44 100644
---- a/meson.build
-+++ b/meson.build
-@@ -15,7 +15,8 @@ tracker_interface_age = 0
- tracker_binary_age = 100 * tracker_minor_version + tracker_micro_version - tracker_interface_age
- 
- # This the .Z used in libtracker-sparql-2.0.so.Z
--soversion = '0.@0@.@1@'.format(tracker_binary_age - tracker_interface_age, tracker_interface_age)
-+soversion = '0'
-+libversion = '@0@.@1@.@2@'.format(soversion, tracker_binary_age - tracker_interface_age, tracker_interface_age)
- 
- libdir = join_paths(get_option('prefix'), get_option('libdir'))
- datadir = join_paths(get_option('prefix'), get_option('datadir'))
-diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build
-index 81578e306..533ac538e 100644
---- a/src/libtracker-control/meson.build
-+++ b/src/libtracker-control/meson.build
-@@ -10,6 +10,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version,
-     tracker_common_enum_header,
-     c_args: tracker_c_args,
-     soversion: soversion,
-+    version: libversion,
-     install: true,
-     install_rpath: tracker_internal_libs_dir,
-     # This doesn't depend on tracker_common_dep because of
-diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
-index e53b21cf9..49c879057 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -60,6 +60,7 @@ libtracker_miner = library(
-     miner_enums[0], miner_enums[1], miner_sources,
-     c_args: tracker_c_args,
-     soversion: soversion,
-+    version: libversion,
-     install: true,
-     install_rpath: tracker_internal_libs_dir,
-     # This doesn't depend on tracker_common_dep because of
-diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
-index c8415efb8..e54333bec 100644
---- a/src/libtracker-sparql-backend/meson.build
-+++ b/src/libtracker-sparql-backend/meson.build
-@@ -8,6 +8,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
-     'tracker-backend.vala',
- 
-     soversion: soversion,
-+    version: libversion,
- 
-     install: true,
-     install_rpath: tracker_internal_libs_dir,
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
deleted file mode 100644
index 1f25f115d419..000000000000
--- a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4238b0a27a3621f4181d38821a4eaee9f0ac1244 Mon Sep 17 00:00:00 2001
-From: Andrea Azzarone <andrea.azzarone@canonical.com>
-Date: Fri, 18 Jan 2019 16:14:57 +0000
-Subject: [PATCH 3/5] tracker-monitor: Prevent stack smashing
-
-Make sure to use GPOINTER_TO_UINT when using g_hash_table_lookup_extended() to
-prevent stack smashing. This will make sure that in the architectures where
-sizeof(GFileMonitorEvent) < sizeof(gpointer), g_hash_table_lookup_extended()
-will not write more bytes than prev_event_type can hold.
-
-Bug-Upstream: https://gitlab.gnome.org/GNOME/tracker/issues/71
-Origin: upstream, commit:63c0a5d4413e53cb76089fda6f56b2d623c5de15
-Applied-Upstream: 2.2.0
----
- src/libtracker-miner/tracker-monitor.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
-index 54cd3e8fb..f2431b646 100644
---- a/src/libtracker-miner/tracker-monitor.c
-+++ b/src/libtracker-miner/tracker-monitor.c
-@@ -611,10 +611,12 @@ flush_cached_event (TrackerMonitor *monitor,
-                     GFile          *file,
-                     gboolean        is_directory)
- {
--	GFileMonitorEvent prev_event_type;
-+	gpointer value = NULL;
- 
- 	if (g_hash_table_lookup_extended (monitor->priv->cached_events,
--	                                  file, NULL, (gpointer*) &prev_event_type)) {
-+	                                  file, NULL, &value)) {
-+		GFileMonitorEvent prev_event_type = GPOINTER_TO_UINT (value);
-+
- 		g_hash_table_remove (monitor->priv->cached_events, file);
- 		emit_signal_for_event (monitor, prev_event_type,
- 		                       is_directory, file, NULL);
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch
deleted file mode 100644
index b3dedaa9e6ec..000000000000
--- a/app-misc/tracker/files/2.1.8-test-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 77059dd4b98f422c1e474b9ee53cc05dde875cce Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 13 Feb 2019 20:09:45 +0200
-Subject: [PATCH 2/5] libtracker-common: improve test_path_evaluate_name
- environment handling
-
-Under some environments $PWD might not point where we expect, so simply
-use g_get_current_dir() instead.
-g_getenv() is documented to return a pointer that may get overwritten
-by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after
-removing the second g_getenv, there's still g_setenv calls, take a copy.
----
- tests/libtracker-common/tracker-file-utils-test.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
-index d1ddf3004..71a82a5c8 100644
---- a/tests/libtracker-common/tracker-file-utils-test.c
-+++ b/tests/libtracker-common/tracker-file-utils-test.c
-@@ -131,14 +131,14 @@ test_path_list_filter_duplicates_with_exceptions ()
- static void
- test_path_evaluate_name (void)
- {
--	gchar *result, *expected;
-+	gchar *result, *expected, *pwd, *home;
- 
--	const gchar *home = g_getenv ("HOME");
--	const gchar *pwd = g_getenv ("PWD");
- 
- 	const gchar *test = "/one/two";
- 	gchar *parent_dir;
- 
-+	home = g_strdup (g_getenv ("HOME"));
-+	pwd = g_get_current_dir ();
- 	g_setenv ("TEST_TRACKER_DIR", test, TRUE);
- 
- 
-@@ -216,6 +216,8 @@ test_path_evaluate_name (void)
- 	result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
- 	g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
- 
-+	g_free (home);
-+	g_free (pwd);
- 	g_unsetenv ("TEST_TRACKER_DIR");
- }
- 
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
deleted file mode 100644
index 85a7eeadc2ba..000000000000
--- a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Wed, 1 May 2019 13:38:34 +0200
-Subject: [PATCH] g-ir-merge: Avoid recursive includes
-
-Ensure the namespace is not part of the includes. This is a kludge and
-shouldn't ever happen, except it does (in continuous, induced by vala).
-
-The next big thing that would happen here is a rewrite of libtracker-sparql
-vala bits so we don't need this merging anymore, so I won't put much
-thought on it.
----
- utils/g-ir-merge/g-ir-merge | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/utils/g-ir-merge/g-ir-merge b/utils/g-ir-merge/g-ir-merge
-index ad79c2d29..321032a4a 100755
---- a/utils/g-ir-merge/g-ir-merge
-+++ b/utils/g-ir-merge/g-ir-merge
-@@ -89,12 +89,12 @@ def parse_inputs(files):
-     return includes, namespaces, c_includes
- 
- 
--def merge_includes(all_includes):
-+def merge_includes(all_includes, namespace):
-     merged = {}
-     for element in all_includes:
-         name = element.get('name')
-         version = element.get('version')
--        if name not in merged:
-+        if name not in merged and name != namespace:
-             merged[name] = element
-     return list(merged.values())
- 
-@@ -153,7 +153,7 @@ def main():
- 
-     all_includes, all_namespaces, all_c_includes = parse_inputs(args.files)
- 
--    includes = merge_includes(all_includes)
-+    includes = merge_includes(all_includes, args.namespace)
- 
-     namespace_contents, identifier_prefixes, symbol_prefixes, shared_libraries \
-         = merge_namespaces(all_namespaces)
--- 
-2.20.1
-
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
deleted file mode 100644
index 3b37db570e89..000000000000
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MAX_API_VERSION="0.44"
-
-inherit bash-completion-r1 eapi7-ver gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0"
-IUSE="gtk-doc +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-PV_SERIES=$(ver_cut 1-2)
-
-# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.0
-	>=net-libs/libsoup-2.40.1:2.4
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.20.0
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.0
-	$(vala_depend)
-	gtk-doc? ( >=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-" # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup
-# intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
-	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
-	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
-	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
-	"${FILESDIR}"/${PV}-vala-0.44-compat.patch # upstream commit e93ea9167dc
-)
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dfts=true
-		-Dfunctional_tests=false # python2, but g-ir-merge needs py3; https://gitlab.gnome.org/GNOME/tracker/merge_requests/40
-		$(meson_use gtk-doc)
-		-Dman=true
-		-Dnetwork_manager=$(usex networkmanager yes no)
-		-Dstemmer=$(usex stemmer yes no)
-		-Dunicode_support=icu
-		-Dbash_completion="$(get_bashcompdir)"
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
index 9e06a84ff2e6..eed86681854f 100644
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ b/app-misc/tracker/tracker-2.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 VALA_MIN_API_VERSION="0.40"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
diff --git a/app-misc/transfolio/Manifest b/app-misc/transfolio/Manifest
new file mode 100644
index 000000000000..2e9ffd3be6dd
--- /dev/null
+++ b/app-misc/transfolio/Manifest
@@ -0,0 +1,3 @@
+DIST transfolio-1.0.1.zip 158362 BLAKE2B 291e80e3576c3d92f00905c49d891c9ff926229cc2d843520b9b69f44660ec16ea274b4b68f4d8f3e353d140a6f8549697f3d2456310a5cd3a0e736ff6e0b61a SHA512 5d8c348cabcc3765c192a200ec011344960704085e815d249db23ac3669760c15ec343b16ecdce3469f49f76872f6f93563d50a96cf305f75ed19235d3a5d665
+EBUILD transfolio-1.0.1.ebuild 615 BLAKE2B e38d0ce4bd582cf15d3150b1fbc395e597dd116b545029da4330abf72e600bf3553ab236e6bac31779a1dbab4ecf165d5e4b1e84138fe27ec96d1d2e6fa01388 SHA512 9912631f08b9e20352833c1d22c80e1c28180cda56f9c11a2bb53353acf4e5ebeee00a6a26b69ae9714f9840bac3ed3d0a49b450c81746302914154ca4455925
+MISC metadata.xml 455 BLAKE2B daac1fc9779cbf0d98aa7e7bb3a42bb5b39b23a2e37f286252f7a427a327e6f15bb7357cf08d98a7f13331fc2b34d721f3723d28d5ca770b82eecaff07e96835 SHA512 b3422e3bf6f540318733516149e402521f2ccb83c3ebe89d5554a1fb505023eae6bdba8649a85c820208704213ec355555309189a49815cbc2408fafb7e5f99e
diff --git a/app-misc/transfolio/metadata.xml b/app-misc/transfolio/metadata.xml
new file mode 100644
index 000000000000..ca128838bc3e
--- /dev/null
+++ b/app-misc/transfolio/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+		TransFolio is a command line tool for Linux and Windows,
+		which enables data transfer between the PC and the Atari Portfolio,
+		as did Atari's DOS program FT.COM.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/transfolio/transfolio-1.0.1.ebuild b/app-misc/transfolio/transfolio-1.0.1.ebuild
new file mode 100644
index 000000000000..e05ba9d60081
--- /dev/null
+++ b/app-misc/transfolio/transfolio-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Enables data transfer between the PC and the Atari Portfolio"
+HOMEPAGE="http://leute.server.de/peichl/"
+SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	# Respect users CC, CFLAGS and disable striping
+	sed -e 's/cc/${CC}/' -e 's/-O2/${CFLAGS}/' -e '/strip/d' -i Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin transfolio
+
+	einstalldocs
+}
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index 716f502365ab..55ede4aa8220 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -5,5 +5,5 @@ DIST vcontrold-0.98.6.tar.gz 86999 BLAKE2B bb2933c166793a851fc9b3292cdf00228e0f5
 DIST vcontrold-0.98.8.tar.gz 87831 BLAKE2B cb6ac6771e087e355f909c63be480caf974632a2fc6378f6c7c461d2cd5d6f12fc0fc762a925d05af4f0ccc9252320009c3f8eee33cc026b5621ec8bcb531b72 SHA512 a3452735bc78ba4add991c03c263c1e59ae6ebfc4eb41f27136bd76c01745990b956dea17b489c6d4f088ec0d69d6f6215f2377baf78ee485e0b31642d4ae468
 EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
 EBUILD vcontrold-0.98.6.ebuild 950 BLAKE2B e8ec145ef75d4ff2d41fdcbd68e5d2f7ad541a84343cef2c3e8cd18d2830df3d5e08815b392990dfa901fa2bd3cf0a554a5d79e1721eda43a251f9cf9832ce84 SHA512 c22d888251d4f7c0e336436758c57c7d8da4e258af9c940c07819b864ebe5105af4903fd316cf33f733bab7a86a4f5eeaa1188652ebf82b0fe82bdbb11f24ec2
-EBUILD vcontrold-0.98.8.ebuild 906 BLAKE2B d48567b6b04374fced2572729a63bafca76c48551cb8f2287538d5f8b7d30feb008a78f457b3f8e3da138fd8a2fea246f64bc03dd439d6cb6ec0e0d149e89801 SHA512 fb4531c3418c5f760dd02703354e2979482fd3fbea755f097eec4861180d189335185fb17d53c6e4aac762e8e5ad5b464ad5cd3c45ee78c647b199af7a07bd73
+EBUILD vcontrold-0.98.8.ebuild 882 BLAKE2B aaafe640329cfab43417cdd6b28b442a886e91e26cc5eb7cf377bc0a46008acf386d1487655ecafdbd703b4a0a859a4875878f90118a97932a270156e76b7490 SHA512 b3b5cf307f36daa5f4cc07e0499bc3ea065ea638cdea0b3a2bc969ecdea847a4f1d35a670230d9048cafd2d4362461a34474d26eb91bb0a7b6d132b2d97aad38
 MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/vcontrold-0.98.8.ebuild b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
index 67b70f6ed21c..2e6f68c2c7ed 100644
--- a/app-misc/vcontrold/vcontrold-0.98.8.ebuild
+++ b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
 HOMEPAGE="https://github.com/openv/vcontrold/"
@@ -22,7 +22,7 @@ src_prepare() {
 	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
 		> "src/version.h" || die "Setting version failed"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -32,11 +32,11 @@ src_configure() {
 		-DVSIM="$(usex vsim)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doinitd "${FILESDIR}/vcontrold"
 	insinto /etc/vcontrold/
 	doins -r xml
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index f2c862ae4e60..6570a39590cf 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 1356 BLAKE2B 3b96ed20e5d1f9734248ed988237806b21db6ba6aca895c9d5e1a0d870f1f4342c756c7d1435eb4e6d60a62d2ecfb8e303af338678169c510977c93f774f8450 SHA512 8860c82806034508fbc17eeb3f8412a532840f5ac6fefa2f479cf0b5b009e5746b5b38e7147b11392c0ca9561d4c2e717037e94664a5767eb7d6dfdcfdcbaf0c
+EBUILD votrify-5.ebuild 1359 BLAKE2B f04518bb1739b3608470fee6a9e81e9e093621112174ee5296365b98a5901f9e0dca447b442b9e6b5e422386aaceedda0c7fdee56fd61e53b4afb79a7783315e SHA512 178f2f3ee72d2d14c3a10d2f35624ce1026e650e92ae08efb9c13a4f13b584b24ec98c349919675b1a5d595ef1504130fd09cfab681e67c02f4b86bb246ee82b
 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 9715317888eb..99fc95370420 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-single-r1
 
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 22741a16367b..77c210124115 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -2,9 +2,9 @@ DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
 DIST yq-2.8.0.tar.gz 14434 BLAKE2B 1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69 SHA512 aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09
 DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
-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
+EBUILD yq-2.7.1-r1.ebuild 1036 BLAKE2B 4c9b7d473284c809b1baffbb1dd4d5d3c8aa86e618ed40c4c44b65619cf4f5b2d3c60ef0d92c4c2befb6e6e9d4f05372f03140e47a3ca83e25916bbc98ca3e8a SHA512 9c199e5f6535247c378647fa580ddf1cd1034017b976df2f556be020388fd4116f9278398e212fdfc355c19dac36738bfa7ad84e8420fd2f56485b52f69bfe97
+EBUILD yq-2.7.2.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
+EBUILD yq-2.8.0.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
+EBUILD yq-2.9.2-r1.ebuild 1072 BLAKE2B 6595add89fb2404c9d4ebb627f7f80c2238da75f849e24c1470f40babc7f11444df847dfd734cb4abaf305ea66ca9fff30e36b7933ea2defab98488fc72471be SHA512 16fc20e194ba2c310b12cabad00ed88975f5fe90e93e68bb157d07de953caf157d47e4d75a69bb4a793a618cf6c3a6a20aab2f26aab0c1ce475b5bb45a31a7f3
+EBUILD yq-2.9.2.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
index 45578ed432d8..8146154e34dc 100644
--- a/app-misc/yq/yq-2.7.1-r1.ebuild
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.7.2.ebuild
index 3c4174e21d49..2c675de66fdd 100644
--- a/app-misc/yq/yq-2.7.2.ebuild
+++ b/app-misc/yq/yq-2.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
index 3c4174e21d49..2c675de66fdd 100644
--- a/app-misc/yq/yq-2.8.0.ebuild
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.9.2-r1.ebuild b/app-misc/yq/yq-2.9.2-r1.ebuild
index b365f59085cb..a569a0b4e890 100644
--- a/app-misc/yq/yq-2.9.2-r1.ebuild
+++ b/app-misc/yq/yq-2.9.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild
index 3c4174e21d49..2c675de66fdd 100644
--- a/app-misc/yq/yq-2.9.2.ebuild
+++ b/app-misc/yq/yq-2.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yworklog/Manifest b/app-misc/yworklog/Manifest
deleted file mode 100644
index 41a793ff9221..000000000000
--- a/app-misc/yworklog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yworklog-0.0.7.tar.gz 9689 BLAKE2B 81353a1909087e553d63cf334bb52b6c3aaece45b327964beffacd239c9d3b2104b399dc92a5859dfc6f4a36d7306783a642493c80c1514e997475bbefcf8a98 SHA512 66a9dd118dfaca04d70738a4edfbd905b19661753bc0a637032cba458b173839d23a1430b3667c90acec6597b98383a0dce8c229a1fac233c84870aff7707fca
-EBUILD yworklog-0.0.7.ebuild 628 BLAKE2B 6a48920e710e64feb6b0012a4e4f4ce53b392816db3b6cc3266286d31cdb0664ea487c9d317363ecc1721fd4b702096519f82cafdbab4ff5e7cd6d6926df20d6 SHA512 639b7eca0b29284c6961acb107ad7cd68aa11a2319f56fc9299aa4f2a1285c29599d2859ed49ab1cba600204b3a2b59cf98e477ff2cfa548bdfa2b0cd4038e58
-MISC metadata.xml 298 BLAKE2B a135303e57df4fd66e4845e3e08994e365db6a67da9e28346d012346ba8d4ff70cda18191fdbe9f809f7a6945f1d1673df5d82f33747cb089f8de792f2ae6d0f SHA512 bb355735f463b4cdda2e5e8d4a4ea5a2eb4e5377dfa25ec0c223be17ed018b0827e56e4573c8171c9517e64c427edfb97c9e58999012e2a8ce9780ab502c5a32
diff --git a/app-misc/yworklog/metadata.xml b/app-misc/yworklog/metadata.xml
deleted file mode 100644
index dde0e7905383..000000000000
--- a/app-misc/yworklog/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">yworklog</remote-id>
-    <remote-id type="github">yaccz/worklog</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/yworklog/yworklog-0.0.7.ebuild b/app-misc/yworklog/yworklog-0.0.7.ebuild
deleted file mode 100644
index a0ec79504713..000000000000
--- a/app-misc/yworklog/yworklog-0.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=sqlite
-
-inherit distutils-r1
-
-DESCRIPTION="Stack based utility with CLI interface helping to monitor time spent on tasks"
-HOMEPAGE="https://github.com/yaccz/worklog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/sqlalchemy
-	dev-python/cement[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-misc
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)