gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-misc
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
206 files changed, 1832 insertions, 3135 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index a7252ded6be9..bf23ea07e669 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 80a4738d7917..041ca3197e4f 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,5 +1,7 @@
 AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
+DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
 EBUILD beep-1.3-r3.ebuild 678 BLAKE2B 8544f8f0ff6aa10875b13d401de593f49c1e6e1b14aca45dff03a053fc2b7c4350dc671766706b05ca87af655ad4db0c154f5eb67f524ca7c20c40501bd978de SHA512 e05d59079f1d8931e7c9626598a47e9d335f7fbd8fa564a35ff566656abfc09b10010922bbcb8d05a5b926820fd529620c3f678d994faf95769915f0925c8e84
+EBUILD beep-1.4.9.ebuild 1046 BLAKE2B 44ec88e8d8af64abb6be9e3b3c33338bbab93ba4e1a52f3836a899b6192baa222ba94b05bce2e5f5d4f72768181f5c1861d201810673646c9c1eb434b273044f SHA512 a802abf9efefcfa2e29974b8c5a0423774a76fe0f62acb65f93c9dc30f5614d4292e8826347f16c6eec8c3cb40647889feb5559e79443a97a39e93a54eaaa9d6
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.4.9.ebuild b/app-misc/beep/beep-1.4.9.ebuild
new file mode 100644
index 000000000000..d6a43378d510
--- /dev/null
+++ b/app-misc/beep/beep-1.4.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Advanced PC speaker beeper"
+HOMEPAGE="https://github.com/spkr-beep"
+SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
+IUSE="suid"
+
+# Tests require a speaker
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i -e "s#-D_FORTIFY_SOURCE=2##g;" GNUmakefile || die
+}
+
+src_compile() {
+	emake \
+		COMPILERS=gcc \
+		COMPILER_gcc="$(tc-getCC)" \
+		LINKER_gcc="$(tc-getCC)" \
+		CFLAGS_gcc="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS_gcc="" \
+		all
+}
+
+src_test() {
+	emake \
+		COMPILERS=gcc \
+		COMPILER_gcc="$(tc-getCC)" \
+		LINKER_gcc="$(tc-getCC)" \
+		CFLAGS_gcc="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		check
+}
+
+src_install() {
+	dobin beep
+	doman "${PN}.1"
+
+	if use suid ; then
+		fowners :audio /usr/bin/beep
+		fperms 4710 /usr/bin/beep
+	else
+		fperms 0711 /usr/bin/beep
+	fi
+
+	einstalldocs
+}
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 445dad5f1351..9fa91fc51823 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,3 +1,5 @@
 DIST bijiben-3.32.2.tar.xz 659988 BLAKE2B a155b3ad4d340b6efe039ae8458be6665f5ea37935b2040d8aa59f4b019a7ce2a9bb42c309fbc212b8f87cd2e3db533305b64d6987b3b527435ab9906165a7ff SHA512 71573ced01a5e984998fc5ce97ebbd4fcf04a91165465697ff29ea67076a31654b8f66a93c3ed79b30a8af2e38fad3ac4bfc3047106411078c6cbb67c20d5c5d
-EBUILD bijiben-3.32.2.ebuild 1023 BLAKE2B bbf22b018156463324ae5fc95643aa29a989f972ce8eec284a1572bc04c14ac38cb899c3f769742f57a10be0d46ef639c44aa5cd406c5370611d856559499707 SHA512 cbc7343453e07bb6f9d775f2f4e59f9758a9c94270ea9fbbf486e93b876b3f6cbae3b8f973f0ef27be5a17cdfe9eaddcee0197a9d3a4ff83e9525fd3623ab6e5
+DIST bijiben-3.34.2.tar.xz 663348 BLAKE2B 7736823334c5439f1da93e81940f6a433b48cf94173606b1985912b408ebaa05d14866b0bbdd0978c08456fe5a592829203aa7fdd31291748148d7973ab3d8ab SHA512 75e1286aabd5c0d5aca3d2150aa36f18873cc0bfeed24a1b6aa9f4d78318d37712df71929f453b2db871021f4df148af8a9ef64d563a2158db8c1dbb620e4538
+EBUILD bijiben-3.32.2.ebuild 1064 BLAKE2B 620d83c31ee5c3bed23deeb6014b0450dfbb8fc26dde69c66352b1047b281fa07ef18c2ba516e255ddb353276463aad6ad7f8a0f503d2ee634e5a1fbf3c45d8d SHA512 f37803a34b7abd2819591eafafa56b5a081cce5f43ae7dd6a575ea6653c4763747a191fc85af9a6ad1050b773fd6eb08dc35037a618592099baefaa216714023
+EBUILD bijiben-3.34.2.ebuild 1024 BLAKE2B acec0535a9ba6db7b3dc1704576b4acbacb76d7abc6a17a8c8da1d4f4fa42d357019f09558eaf04864b7419ccb65a9113a8155b8db4b79df2f8b1967435b43ee SHA512 e362a8383b2b34867ba6aac6c5e367e250be4943336d9c5fc971037340bf12fc5688ffa3cec67736ecb547f60ee4e371767b480a220f871d793482b7345b5a34
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.32.2.ebuild b/app-misc/bijiben/bijiben-3.32.2.ebuild
index 1baa2177e9b6..61f2246946e1 100644
--- a/app-misc/bijiben/bijiben-3.32.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.32.2.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
@@ -18,6 +18,7 @@ DEPEND="
 	net-libs/gnome-online-accounts:=
 	>=x11-libs/gtk+-3.19.3:3
 	>=gnome-extra/evolution-data-server-3.13.90:=
+	<gnome-extra/evolution-data-server-3.33
 	dev-libs/libxml2:2
 	sys-apps/util-linux
 	>=net-libs/webkit-gtk-2.10:4
diff --git a/app-misc/bijiben/bijiben-3.34.2.ebuild b/app-misc/bijiben/bijiben-3.34.2.ebuild
new file mode 100644
index 000000000000..f83923e7b5fd
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.34.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-misc/tracker:0/2.0
+	>=dev-libs/glib-2.53.4:2
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.19.3:3
+	>=gnome-extra/evolution-data-server-3.33.2:=
+	dev-libs/libxml2:2
+	sys-apps/util-linux
+	>=net-libs/webkit-gtk-2.10:4
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dzeitgeist=false
+		-Dupdate_mimedb=false
+		-Dprivate_store=false # private store is mainly meant for flatpak builds
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 682733c5cfb3..b1b17b39ecee 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,5 +1,5 @@
 DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
-EBUILD boxes-1.1.2-r1.ebuild 859 BLAKE2B 85d30e0a9b09c8809f86ec1a55ef3d9f9ad11b71725907fe52e80b6c444128b9d0a8a7a7d051490500883843125d95d2f91ed5c2f99957b55d6ed75caa18d22e SHA512 379576f42e8916d8dda20574720d9a7d86acc2432c07d117a195b79f2a7529ed67dc8d7b32e941f9f8fcc6f67b3b30c78eaca3fcba409f2f9cc061b15f4cf6d3
+EBUILD boxes-1.1.2-r1.ebuild 860 BLAKE2B 8f8cda39d4b621f438952903f76880a67eb4e48f6367ff9e2ef9fa539b2e1d3d6114e3fbf253ff6ab83d1bdac2561c974f7653bc9d6be09580189dfbd07991b9 SHA512 f2e2c43a74d568c48122bbfeef78bdb5f8030ae79c0f80fada245e1c23871ae6a3b3ef300020c07f885b3d759da1b832b544d49a2b30ebabe54840744c2261f2
 EBUILD boxes-1.1.2-r2.ebuild 869 BLAKE2B 5f3bd74b15f2d94d34001195d5c1856e98ad1056c51b25a82ab745fddaa7467ebd00aab5d39eb9719bb64ab3dc9b68cd74791e8f5593d6dc782123c648ab2817 SHA512 93ae9c4536ccae41faf5d0e7635a1071b44b97cebb82e243caa6661ba5ce2537f4bbc8e6617fb822c0545c661d0d99a05d4acfc72199a45adaf836e0afb1fc23
 EBUILD boxes-1.1.2-r3.ebuild 865 BLAKE2B de22a3d24051526bbf7d6b8cab6d900c37cddc769c40e63da62f5d45c77137aec3cf1d8f63fd4b3ba277e75da9b63ba020c16ddc80e7a73ad619ab4175948953 SHA512 81690b190e92686877552b49ad1e0d974b74b6e822cf6c101b4e5de85c7b256be6b00a4e3fbf6f04c09f0e3e328aeac4d941bdef33f78bdfaf935895103d554f
 MISC metadata.xml 357 BLAKE2B ce56f6092cc7e6a1509a1be7627f92c543e64274915bdfaab74a03bb64c230b586c939a1fee654a1d81774076e35c9651e90b73d262330fae7b4320a31693af2 SHA512 37d5831d4633bd9f5d3d113841f6300adb8945827fd113bb9366181e11bd0234f7804f7bbb1b930e40a5a0a55e402b4561c8765d9d747100021c2e4ec5ba2074
diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild
index e4196b94a581..49a128d9cef8 100644
--- a/app-misc/boxes/boxes-1.1.2-r1.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 777a0bc21ffc..b8dd1c4f8319 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -7,5 +7,5 @@ EBUILD byobu-5.123-r1.ebuild 977 BLAKE2B a2f8b13b92d9bd618c46c6e2c9683a449fbfa68
 EBUILD byobu-5.124.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
 EBUILD byobu-5.125.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
 EBUILD byobu-5.129.ebuild 989 BLAKE2B d733be11979684db1df4dc8aa2ad17febf9db4a556fe78653a2cbea159e5ec0f57efea905ee77e025fa8f1b03dd5fcbb22ed94da762d717f76b7d38efb3ffe28 SHA512 9bf5f039c393f6ce7982673a6126d23eaecad86a42d2567dee54b124bf96cbd570e8bbf5a5f53ae2b6fe269c04d0093d3808eab1beb60faefe7561f1916b7485
-EBUILD byobu-5.130-r1.ebuild 985 BLAKE2B 371e7c2662f57d4504cb756b29c1240e74c7d1e55b16aa71720d157914109ac85f0b7241c92aafcd2bd86af9259fd3299eaf8b43b0658b0182215bf368c973c1 SHA512 cc6283a7165bb1ca3eca688c9dbd8e79b04269de7402ab2107069b72065b9a5b94dde68eb7bf36adda2707ac3e19122446fe78b86da33d513d5cad3f2e226068
+EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 0cdcc9ab649b456a61254f9c5aa8229e859b7b6459fcea5af7204e5d07f60b9b3fd8a6375b8b33d83b63b027d8c7aeb4072d47205ed7e52b14e22f2efb73859d SHA512 30ee9fd03cf65004eb0ef05e3b7d39da0e70a9d29a0d88e857544a436ba655b0ea490a8ba04d6f6d3814d60464090c51b2e0b9e82bbcd87b00e80cabac5abd58
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index 59b72cc7ec64..fa00fb9e9729 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index fbe8e47a9075..5a198ee30e72 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,5 +1,5 @@
 DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.0.2g_p8.ebuild 992 BLAKE2B 842e588cd44c38a14b7e6a1530f00734b0b3c43bfc98ed5d668f5f323a13a133c4b8cf40b9707521a411dd1b4446a1483330833cf83d250248d5364c90726ff1 SHA512 db7aa21b7637ec97ed37b7ae14ebe841afd913d1b4c27834e1199790ff1db0f64837b37ea50aa869e842a76881450076e557d04c8b9837723df1c18f48e2e117
-EBUILD c_rehash-1.7-r1.ebuild 1000 BLAKE2B fffa6ad4550adfbefffcd9cf5822436588bec83b34048af09ada50c5fef79c1d4a0ebe4d6d66f436b81364d1ddb9867043552cbd7c56b987ce230838a427eb0e SHA512 4051bbe1c737c948c5334d92a53210c1c46e83c2a525e1ba2d4f2ec6df6837cf4f62228e3d6016dbffd56fe30250d0c16e7ed10bd32df102fb0be0660e274855
+EBUILD c_rehash-1.0.2g_p8.ebuild 985 BLAKE2B 7e68fe19402a98cdb46ce550317c1bdf228ef4ffc617aa9d3231b45a1f38dd18756614288275f662662199a9f1c70c1a8b1fa312cd8e5b31c2e2f0c85313516f SHA512 e4bc03edaa4c75cc2086e345dce05195e6ca7edf71db854c5143d43ac9b5a8ff4ef38257dacba1860aa0d5a3a9d4085c40e3380b388efb0c71efb522df78da5a
+EBUILD c_rehash-1.7-r1.ebuild 998 BLAKE2B d5c5fb11e4bbb881ce905813709a624a99e8557d0d8e41cecb85495d7c09de0a2c1bf5d66edbaaaf4d5150efd039b2cc6c8f24257e25e2644ac172e0cd7b883b SHA512 aef00aed6414d569d1a8b9b408a57f8173639e7edf1fc2fa0a4aefb7ae0e60c9f7f38621b03929f7a590e913762b4d055c167aa0c699cc6a14e90fcd050e51c7
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
index c88fab854424..9565baaf5d84 100644
--- a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 8ad71bfdefb7..2c187763f3be 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index be732362beed..d57d4c78490e 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 5772 BLAKE2B 698479fee419513c09f452612600ba383595f77a478e1bf3299bd5f3c49b03bfe482afef23d4cd4226ee8d2933d85961d1273fa0b42133e63c0b4cc97657b94a SHA512 df794184f8d8baa57c730563ffdd65a6051ded9020229c4322317d72cab95968051a9e318c49d104aa882ca54093bd77944ef18f8389d09e827247272cfe51ed
+EBUILD ca-certificates-20190110.3.43.ebuild 5770 BLAKE2B 128b095a01b29be9caf20d1d66e64163c9af37daa69904a5fd47b89df36bc0bad15a8f7955b644d6c6b7ae18e3e17eee6e140655ba3e7a16fa012186812051c3 SHA512 83c84d9d7b7e8ee95f4a881cfd5b459949dc9110b62286500eca4fcf9aeb8c50b98771ce174637a77118e9b5ff9a684de3e8a4c53e7d40d0742736c4b04e1158
 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 871207e9ae75..5e4f5479ce63 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index ec11c4e524eb..b158df79d413 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 627 BLAKE2B f19cf9d43637dd8a780166c1544d712bbb3d34184ec6e8c30849f2155f263ddcf99c8167367acec9f43354a05148a20cfb2830999a9583a30f8a9dcde68a7d52 SHA512 c929a3ef0c57e65f5ce43f070e34a5406407cc85c71fbc3da6943f6bdcf64c7c130cd6de9e58f6815bcce3851032faa53b08d3894a8924cbffc09f41139463c1
+EBUILD calendar-0.9.1-r1.ebuild 628 BLAKE2B 2e0eadbd66b519d477128c6e43bbfa87ccdfc47600821b6a9ffd91463230fc9d9c681daf9fa86d47db60ae49c0dd51d1c9d5d4a2f8fa212ba16689f1e402b40f SHA512 7d8852a4029cf9ced79ff424a27f1a24c0cc8e103650102cbcc132e4807ed6de7db88898881e26f45cea992a5949eaf750f858f03d55dcf76c4a68b4f2801213
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 9108b784504e..a92c702aa224 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index f086b079d466..4f955acb00a1 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,3 +1,3 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
-EBUILD colordiff-1.0.18.ebuild 935 BLAKE2B 376c884e86e5a11295bef4a772263fb59b037902a32450944dd48fc89db4d0a80955585a1299919d2de2ba461fa9c981379b69e75c62b4f2de5e8359a0463407 SHA512 1bd769df967aa7edee538052512dfdcfed8773fe91bb8050134d6ab60792c3069c6ab36ddbb8fa53f784490276ee6200516c484c2b185f8b52b51a98dab34345
+EBUILD colordiff-1.0.18.ebuild 936 BLAKE2B d02f7bee2f06e05df8ea94539d9052d0ac95048d5b94901b9bdb34c81ded3c039192c8a995858501082f922c0dea0c371fa7feb805a065c807487a4c7ede2ccc SHA512 65d2e2eed05517b65449812096d8541d7b83ad307fbbf07e68e0aae912dda60132a7bbed3b576451322252ac725c1df45f820a75882354b500872cfbe07434c1
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index 5d3f41bd6607..47466f9aec97 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index f843c4ee0f69..dc2fcbf0250e 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,7 +1,4 @@
-AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c16272e846f3c470ee882ab9313b5d5974d29b6e73835278c61c032ba3d6acaf2026e9d3e91c5cac825bc4006c6 SHA512 390ff54428a4ffbdf5cc383aa6229f3ed7be7070d62567a0a04bf169efb6e7fe21c756d34d7865f51523a26204e6014edf936800523723d5f8370997f06dd858
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
-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 948 BLAKE2B 87f803238f977fbae01f66c8f34ad55ff36295b903ec4c784257340d8f2bbe2e932e46704dd96e9df620cf9b5b1ddf8444213ca5f3d1ee261e2100a042fbc3f2 SHA512 9340de4fbdfae896e68f8ae716a936f99c8914e2539aff89040cebe7ac24f1bb0ec9231f9fcaaf14a3b14c13bef6dd8b578827a883a3d6d59a5d60211455ed7f
-EBUILD datefudge-1.22.ebuild 976 BLAKE2B 2378144ecf8ca51493f777bebd0f15a798cb37aad7e9bc329465f7d1ae138672b1c71c477e36747fb1a1bbc44877ca2fd4b1d82f1f414108093286cddc2d0844 SHA512 c2b0bdfabf8e2d30f939be8b98bd1e2af7106ef7086196f0b8d66fa58e65284142c95cd405f17a56857e20027368bf53a9fe07077749511a996e9b4f0f4697b1
+EBUILD datefudge-1.22.ebuild 972 BLAKE2B 90a74afdd3aed0e24664363a97e3705562e87ba7b36a3cb89a289a2c283d974dc9fa1d05fdfa96cace72d0465477b5714abf4037b70d4d74a9c8fe19bb421142 SHA512 2f0751972056f2a749b4371762e0e5a987a700e874b159dc72790d34af017b5a8159ae4c9393104238257d3bc34e3c0ff75594611f2b00bd7068e61abb763b37
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
deleted file mode 100644
index cf9c3d191796..000000000000
--- a/app-misc/datefudge/datefudge-1.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="A program (and preload library) to fake system date"
-HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch
-	sed -i \
-		-e '/dpkg-parsechangelog/d' \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		Makefile || die
-
-	if use prefix; then
-		sed -i -e '/-o root -g root/d' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" VERSION="${PV}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PV}" install
-	dodoc debian/changelog README
-}
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index f7408d7a331d..fc70d16658cd 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.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
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/datefudge/files/datefudge-1.17-bsd.patch b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
deleted file mode 100644
index 2f2a7dac9be3..000000000000
--- a/app-misc/datefudge/files/datefudge-1.17-bsd.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b2f81bb..35da75e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,17 +12,17 @@ compile all: datefudge datefudge.so
- 
- install: datefudge datefudge.so datefudge.1
- 	install -d $(DESTDIR)/usr/lib/datefudge/
--	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
- 	install -d $(DESTDIR)/usr/bin/
--	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)/usr/bin
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)/usr/bin
- 	install -d $(DESTDIR)/usr/share/man/man1
--	install -o root -g root -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
-+	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
- 
- datefudge: datefudge.sh
- 	sed -e 's,@VERSION@,$(VERSION),g' < $< > $@
- 
- datefudge.so: datefudge.o
--	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
-+	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
- 
- datefudge.o: datefudge.c
- 	$(CC) $(CFLAGS) -c -o $@ $<
-@@ -39,8 +39,8 @@ test: compile
- 	export TZ=UTC								 ;\
- 	ret1=1; ret2=1                                                           ;\
- 	for i in 1 2; do                                                         \
--	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
--	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
-+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
-+	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
- 	        exp="1970-01-02.12:15:00"                                       ;\
- 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; }          ;\
- 	        echo "failed: expected: $$exp, actual: $$dt"                    ;\
-@@ -49,7 +49,7 @@ test: compile
- 	echo -n "Running a simple perl localtime() test... "                    ;\
- 	pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
- 	for i in 1 2; do                                                         \
--	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
-+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
- 	        dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"`         ;\
- 	        exp="1970-01-02"                                                ;\
- 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; }          ;\
-diff --git a/datefudge.c b/datefudge.c
-index 8c86652..fc7e3d6 100644
---- a/datefudge.c
-+++ b/datefudge.c
-@@ -14,7 +14,6 @@
- #include <stdlib.h>
- #include <dlfcn.h>
- #include <assert.h>
--#include <features.h>
- #include <unistd.h>
- #include <time.h>
- #include <sys/time.h>
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index 6a253fd127da..5f69e85ef73d 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,3 +1,4 @@
+AUX dateutils-0.4.6-unportable-sys-sysctl_h.patch 230 BLAKE2B 66d3e0f227e06eef659c087512a21741c8375a5c7e4cb740cb95eeb5745bcb58830a1a5f19fcad5e4ed14b6de35ccfa9362ddf1a118b3bfcc9fc719467aa2814 SHA512 f42337fbe428503008c2129a82b13d536d7ce395e2f90aeffbd05f6ec358a80dc174ca5ed4e2f3113771b24aec15fc160537e8e6b4bb1743dd5fb6b6807a8f2d
 DIST dateutils-0.4.6.tar.xz 640552 BLAKE2B 7f1b5bef1465063f46a7bc4b64ed1d645b3bf827aa17b7c962bf3e2731a031f8cf074970aad618157283f0303222413c7be80a72bdcc65bd0918120216542295 SHA512 014e8411774250d2862943bbbdd69cc7ec2ca934349272ae7c44b136a57ef30c23f841018cc38f86d49e2348b2199848076db224e3653d6d7337a3f17709c8cb
-EBUILD dateutils-0.4.6.ebuild 542 BLAKE2B 2189e685ce1d741a5f7a4b57f703a725d4c4eaacbcdc6a69c7018485c5933b456b2e0bff7bc6c0212415778ad15a13230bd46239c99f86f6a356237696f16706 SHA512 94d5cc23635f114afe23c25a45a9e3f56bb77eced55945e71c7858f6d0aee79a1d283d8ca62c169b1764fe781bb8650d558e3f3b481e9ba8b13024b254aca23b
+EBUILD dateutils-0.4.6.ebuild 604 BLAKE2B 7b9c29347a8295c5979d7241e712b96c720babae149e24c128ee39c19739c0d9233c3acc91441ca6a6fd6223c072b6d36a1e7f4406718d58876d5152d0aaf39d SHA512 380a0ca5edfc1bcc2bb96a71e508eca7338b79f31b7d829f11de84c743b7c92a5415d730b80242c3ac6f3dbe09ca842f33068206d859d44d88c6cbcce8ec853f
 MISC metadata.xml 254 BLAKE2B d95972610e33fb3ea47a13570a20c2f807ee9a8110a0450e45461649c4d61ef723abeccacae55feb4c7d4c31f0808e750de98549eaa880f043b4ebce26aa0bd6 SHA512 3537bb9cb6329ac910efed6898ac049d4591904d1fc1955992ab527874af0c69ab872c293a4b042bf6b0ff61d59938442321aa9fc4b0049877a4b348139cb465
diff --git a/app-misc/dateutils/dateutils-0.4.6.ebuild b/app-misc/dateutils/dateutils-0.4.6.ebuild
index 0c4b76cb20e9..7b12131bfecd 100644
--- a/app-misc/dateutils/dateutils-0.4.6.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.6.ebuild
@@ -17,6 +17,8 @@ DEPEND="app-arch/xz-utils
 # bug 429810
 RDEPEND="!sys-fabric/dapl"
 
+PATCHES=( "${FILESDIR}"/${P}-unportable-sys-sysctl_h.patch )
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/app-misc/dateutils/files/dateutils-0.4.6-unportable-sys-sysctl_h.patch b/app-misc/dateutils/files/dateutils-0.4.6-unportable-sys-sysctl_h.patch
new file mode 100644
index 000000000000..dc310ea7812c
--- /dev/null
+++ b/app-misc/dateutils/files/dateutils-0.4.6-unportable-sys-sysctl_h.patch
@@ -0,0 +1,10 @@
+--- a/build-aux/yuck.c
++++ b/build-aux/yuck.c
+@@ -65,7 +65,6 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #include <time.h>
+ #if defined WITH_SCMVER
+ # include <yuck-scmver.h>
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index 63f1c439cb94..b161212421cb 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,7 +1,4 @@
-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
+AUX datovka-4.15.0-appdata-to-metainfo.patch 404 BLAKE2B 667cdb41220c9de92f1eb60affd48045c45494dc14c6c6ac1cbd79b56ee1e5e1174f99b4c7bfe7c261445272304ad9dc8efbaf885d26fd61e6d9e6191c74a16a SHA512 a70432722acb3e34295fbcb8e4657f4bfd3a372d329c20121fdce2b52ad487a31b10ac78a8bb97a0107af1355909d0daa67d4f9a6cdf2fb8395ce60073a620af
+DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
+EBUILD datovka-4.15.0.ebuild 1146 BLAKE2B cf5271a931f258bf7eb97e8fb2233cc614642aa020e699826a5eceb58eac759bc11d8ddd901402d811badb6352ea4df992c27d47dca7dbd4eef10175b6d836f6 SHA512 6a0a803a88c6cf678d33bd83adbdc20386cec487842e3faf31a95894a758930ce63d355fa05f0fe5c26ea9c8bf767302514991512a7a4c616fe31fb6d65c5c15
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.11.1.ebuild b/app-misc/datovka/datovka-4.11.1.ebuild
deleted file mode 100644
index 101d7ef8a9dc..000000000000
--- a/app-misc/datovka/datovka-4.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-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.10.8
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-"
-
-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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/datovka/datovka-4.13.1.ebuild b/app-misc/datovka/datovka-4.13.1.ebuild
deleted file mode 100644
index 7dcdeec590c3..000000000000
--- a/app-misc/datovka/datovka-4.13.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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.10.8
-"
-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/datovka/datovka-4.14.1.ebuild b/app-misc/datovka/datovka-4.15.0.ebuild
index 92d8b525450c..b0cb647f2d37 100644
--- a/app-misc/datovka/datovka-4.14.1.ebuild
+++ b/app-misc/datovka/datovka-4.15.0.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
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # minimum Qt version required
-QT_PV="5.3.2:5"
+QT_PV="5.14.0:5"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=
@@ -33,7 +33,7 @@ DEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 "
-
+PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch" )
 DOCS=( ChangeLog README )
 
 src_configure() {
diff --git a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch b/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
new file mode 100644
index 000000000000..c824777436e7
--- /dev/null
+++ b/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
@@ -0,0 +1,11 @@
+--- a/datovka.pro	2020-04-01 09:22:29.110403965 +0200
++++ b/datovka.pro	2020-04-01 09:24:11.984441796 +0200
+@@ -72,7 +72,7 @@
+ 	desktop.path = "$${DATADIR}/applications"
+ 	desktop.files += deployment/datovka.desktop
+ 
+-	appdata.path = "$${DATADIR}/appdata"
++	appdata.path = "$${DATADIR}/metainfo"
+ 	appdata.files += deployment/datovka.appdata.xml
+ 
+ 	icon16.path = "$${DATADIR}/icons/hicolor/16x16/apps"
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index 2356f2ccae4a..57c56bc9a00f 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 687 BLAKE2B e2b42a69f43561e398738e58fca0cccdca93499fc6d2491d688b43613810fe71c42072d09b7074ce0d8f084c024d1e85c4d7166f533c79945b245f7511402cc3 SHA512 d6a07daf0cdddf136846874ea39034770e6839543b3ba19a0cdb432d66daf19ebc66a17e3bcd4f5020a332bfd842d7bfa1890f9cb87634f1428ed3588a671653
+EBUILD delay-1.6-r2.ebuild 692 BLAKE2B a0e3b88aa9e2500207d13021ac326800fd1bc733d26fd23f253fbfd37aee4ea8d840cc507a06ee8229972822634c9e95a484a3ef4026e0dffd428840ed5cd6f1 SHA512 3ab26b6ecadb4cebe188d9a16a83387603a3e92f8a4257acbd3f7199ef125ff84b22002f9cfab84e45b98202da698b6795752353427a12e145ce2872e05f3b5b
 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 68548f2918cb..7f2012dc9ed2 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index 8664c9ae2eb8..d31605017de6 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -3,5 +3,5 @@ AUX devtodo-0.1.20-gcc43.patch 217 BLAKE2B 9d8af6ddf3036120498fda96bc493b3ce5e48
 AUX devtodo-0.1.20-gentoo.diff 3744 BLAKE2B f80130ba310593442d92013a51186af2ec082c0c4cde25981432ccab76a77dad38197e8d84b9939d3ad78e6442196315b446d431daa675bb082e488723b86a48 SHA512 f2a6de30807c2ec718725491d92f4906c50b944eff389e15d17cb2982127112d443e08096b6923ca76ca720832afc1fd561bd55a327ffa435e1e21abda07abbb
 AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
 DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
-EBUILD devtodo-0.1.20-r3.ebuild 1676 BLAKE2B 2edc264d6692b16f99700bf5e7d15518610681b58b6fd5c5397cc7466c6f19752cf41b138b1ce7c1e7ba563260325c0072a94c83c33770f3df1bb0ab27e16d05 SHA512 b77db583efcaa802dc380c5d2e14224fb11f09f368ceafa8b9982862959176b2598c9ef7d91574f6faed65799e45fd41e0dcfffab59fdc1d99667c3820929d45
+EBUILD devtodo-0.1.20-r3.ebuild 1673 BLAKE2B 1edfe14498f5833c0259af46cf308ad85523b0f8412f5521cc32723811648b22f0bac874fb1a2b65b416ab049d572856ba94cc342b89bd8c36e2b882f5e577cd SHA512 9d06fa8df6514c81904a4b20e157c9faac7dd20bf221e423b878768b0b4339636bb19683b823416482b4a368abbce398792f1e6efb8e76e2b9d00171ebb681b7
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index dc014e5380c3..9df11c8be175 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/dfshow/Manifest b/app-misc/dfshow/Manifest
index ae5720c29c83..af565a6ba5a3 100644
--- a/app-misc/dfshow/Manifest
+++ b/app-misc/dfshow/Manifest
@@ -1,5 +1,3 @@
-DIST dfshow-0.8.0_beta.tar.gz 97301 BLAKE2B fa98ef37d23ef39e8512eed410d4a3a9e45aee87d9ee1c35230a9bea47af61c936091117c7232c195cd661ba61b09376ba1db4167bf8388323311f2a2fa7b6a6 SHA512 79cd82916521500d5f6f7ab00770af084f1a52069fe5625b7336f3081084ece6d2773be7f5480c444455ad3151e603d937b3feb279a18502c435c1a05d6d1446
 DIST dfshow-0.8.2_beta.tar.gz 97733 BLAKE2B 99790b6901760a5e4adc7942fa84d11fb9d5e2f4e60a5d4abc2ce8fed0e86ab5f3def67c2f567b1ca54f1ecdbbe04522d4a75d69694b0ad213a69d86d49514e4 SHA512 1fca7f72c0200df13ac6e640314f9ad94ea3b88eb62a18a606f3a06a02252107f59747fbd404891fff5898b3796650023827ca59ceb690a0aa45e3c0a8bca749
-EBUILD dfshow-0.8.0_beta.ebuild 734 BLAKE2B 94dba6b5ffbef8e703a05a16f6f61ae7e64f64771e5dc5cbe62c4d61eab9af8e2123c94c6184c5e9d88a8b18cee4a836ac3c52168a9a262077b8702f0353f32d SHA512 10bb9a6127c6727e79cca0abc5c1d15da27a7f9dcc568091ef5c06f224864b4c7b6e6a8fece758a4fc6a7d4aeab6e6961bdb795fbbb19674934d3ff61a26e72c
 EBUILD dfshow-0.8.2_beta.ebuild 737 BLAKE2B d172580efe123e969118b89e31c235f244a7767e2500555b6ef08fbf47675e6f4396d8b0d0eff11d8eb6f91c29bda3e4d73fd047abb5ee2abb1b7d51c2f5c56f SHA512 9b3f8bebdf15d474dc0fe8baceaac97af80f4e54cd8a77ae12480f774d5e8aaaed038a8b4a8e3393545173cd0dd58589fbf8d63745f52c4fe69ff7ba39424fe7
 MISC metadata.xml 637 BLAKE2B 30ff2ed55699e7482978875ab5af6058eb9ba91ff46756df7a2b6fcdf93f01026c87c61ed3ab1cbf2ceea9fbcb9e85730457bdcb93bd8f6461e869fc55398a82 SHA512 ca6da84af5bdf429ca98077e5656a4704771d11b9e0b13aeade9d0fc375634f4c50a94c57bf8866ded03c19cd99b7866f48b26fb1c271847816812b758fc6eea
diff --git a/app-misc/dfshow/dfshow-0.8.0_beta.ebuild b/app-misc/dfshow/dfshow-0.8.0_beta.ebuild
deleted file mode 100644
index c452101f7fc3..000000000000
--- a/app-misc/dfshow/dfshow-0.8.0_beta.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV="${PV//_beta/-beta}"
-
-DESCRIPTION="DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT"
-HOMEPAGE="https://github.com/roberthawdon/dfshow"
-SRC_URI="https://github.com/roberthawdon/dfshow/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libconfig
-sys-libs/ncurses:0=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's/LDADD = -lncursesw -lm -lconfig/LDADD = -lncursesw -lm -lconfig -ltinfow/' Makefile.am || die "sed in Makefile.am failed"
-	eautoreconf
-	eautomake --add-missing
-}
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 99fe4adf6912..3030c7d508fc 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 934 BLAKE2B 90eefefd879717bb36162eab125bad097e6a4c946fa06d0ba9ba1901e6205f2bd10c7b4b953ecc24c5038977f7ea237b04749a02afb91ad217054e3898d80d51 SHA512 263a2d20140be819b4dec88f0b3d53ff954f3152208d279a697cd8dbdf4e405ecd8eea475fdba46f0db7e77cbfe90d8b631d15fa4d9f7beccedfe38624c385e0
+EBUILD editor-wrapper-4-r1.ebuild 932 BLAKE2B 59df0cd302212136586014b0f2285b81bd956d509b40a24b6bce5915dc5dc43bb577eddf93082b9508c3776babad30f695f04203c48cf7cbdd622161f9a76e2b SHA512 cd37a9821c0198c77ad409507e35e4cdece6c385033ce1190d9aa97251ae4d24cbd182d3fbe2442ada484bcb1989254252744256647792e970827f0e5a251c55
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index e2281c0899a3..7e4574094a90 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 6a71f7033e2e..f3c8dd3efbee 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -12,25 +12,25 @@ AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e SHA512 cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
 DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
-DIST elasticsearch-6.8.4.tar.gz 148628251 BLAKE2B 09f7a18a1ee6f40154f2181bf354c15da910c712226dd1bb5ee418ebdd371a1ea24e1164e7218736d28f580641c85f70cf40918eb77772470a186f61ce9cfae4 SHA512 bfd00de65b007ea64a88af22f14005774994e7d3a12c416dbda64465ce656634c5ea5f36e5a397ae67ed1e4b4893d758ab4e6e4770c8a65ccc61b2270aa17fa7
+DIST elasticsearch-6.8.7.tar.gz 149923635 BLAKE2B f6945db5f32f8c674bff311a88957e4742d123fa31019704f9139b275506618a8d68c08306bc11590ce604c3884327ea7d5b4d98c4e1362ebcf9330675dd198a SHA512 d3232a7e58076a581ef904aa5a14fdd146e0558c166a0e71262a20cfd2eb1891df8cb0e526e4268c241444bcb1521f2115e532a0f87a9529524f3228aeb2f702
 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.2-no-jdk-linux-x86_64.tar.gz 141758515 BLAKE2B 67b6a844c671ce5d33e16282c34ba9cb82d19511612f775e6e238854c1074fef33d03e0a001a111ffd514a3397413ab335c53a1d947cfa43c3a1221da3de065c SHA512 64d6b3f1d30869f53f26a7fc60b8ff7f6e06457bcd437404cb157801a9faeb6a61b890c52eadd614fac1fa18692a07383d01e539d52371cf84f23b5b1dbc73bd
-DIST elasticsearch-7.6.0-no-jdk-linux-x86_64.tar.gz 147868801 BLAKE2B d298db386433c2965e449089d03dafcc2c4b61e32f2fd0613c49113291b1b35c01bbd72bade0f71bc4b08b18c5e9d420b00bd5330c33eaf5ecbddafd056f4a26 SHA512 643dc0aa1fc6a51604c783a9de6c23423e6b25d2d524804c9995d3d8dd447195ce52dc2e3251956b688da0b534da8b023b12dc8b187ca23620165d2ec53223f5
+DIST elasticsearch-7.6.1-no-jdk-linux-x86_64.tar.gz 148131656 BLAKE2B c613168ff660038a0c34c50463aecf1ce3fa17b5dfd6032745ba49486c2b4283d7b5c4ae429be67c8523014555dec2627b431abf3bce53f817d3d22b31d2fab9 SHA512 7f5f73a0bf66052df7db95c0bd5219ee1a9662118d90a65b012afaf4eea16a6c4146f375e981260e4517743ccc48df779ccb9d9d59918124a8dcb517abd3f37b
 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-6.8.7.tar.gz 68646087 BLAKE2B c97dacb7f98dd6ce8980a4a0bd327bbaa8705cd045ed1ddc95ce1d0d3d8a535e2f871784b60247468b3cefa2e7401cc881ab6a4197aa0688c10abdf41774722d SHA512 ace12a099112ba16f8298d789dc0d4866349f54bdd66a9a6ba9bca08efb4387558d9962b2b2c28f3ed8ed1f02b1982dc13f7644f8805819137219c9a02fbaba1
 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.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
-DIST elasticsearch-oss-7.6.0-no-jdk-linux-x86_64.tar.gz 72554604 BLAKE2B 34cf380ccdf4521f0d08c239b9b34bd88bb171210612a5df38cf4a536321702b1105c6047b1f22569483c2daf50c75e27c48af28c385f09cfc885512e92bb214 SHA512 521f3b7b3f4624f0039b7e7ba75d811f5d79fb91112c0eca261e2693327f75047be13d147536a33192cacdc5c9c84f94a6090e4678c915a1d59b0b89235eb8a5
+DIST elasticsearch-oss-7.6.1-no-jdk-linux-x86_64.tar.gz 72567711 BLAKE2B 8fe3901cb3ce6577918f6b711f63e0ed8f10013a01ae8c197cda8e5592b2e7c99f0bb7179decc19e26ed160c21d7cfd66eedc3d6fc265e89244ce1c9a5ef27c5 SHA512 da396be8bceec32b5f4c4f9091edee51710f39f5aa1135c7c392719d9fdd0c99e92b681cf628135013a37fd881dd15540d6c660a50bb18b47991f0d723aadb64
 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-6.8.7.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 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.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
-EBUILD elasticsearch-7.6.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.6.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.4.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.7.ebuild
index f2652b931f0e..6191d3d9e2e0 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.7.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
diff --git a/app-misc/elasticsearch/elasticsearch-7.6.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.6.1.ebuild
index 2155270debec..2155270debec 100644
--- a/app-misc/elasticsearch/elasticsearch-7.6.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.6.1.ebuild
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
index 9bb9ac93c8f0..e8af49d62bd6 100644
--- a/app-misc/email2trac/Manifest
+++ b/app-misc/email2trac/Manifest
@@ -1,7 +1,3 @@
-DIST email2trac-2.6.2.tar.gz 104732 BLAKE2B 0121497f98aeb1c8374e03c5e68f6ccb669dbbff757379121bf34b3c670f2022e31c7bb91bf78f505f490025f028948db98727533f3cb434e5ab49a4548e1269 SHA512 69b596b4c60ccc40b53ddfce5c13d5d7f27ac1fc5674e1cb3fbf84b083c2abc77d36879d665924a62b826e7d3a52d0ead1e1d693a55aae5edfc092998e01a0df
-DIST email2trac-2.8.4.tar.gz 107791 BLAKE2B 69973aab1ff851917bd8db3fa1fc3495da65b9be274d3e433dfc46230a108494b2790441e0f801e4beeaf4126e6fe1ee37a7b2627108bb36e931cc6fe5186e81 SHA512 f0bfd00442d50090f9cc582849026b08bb091bc72223b4569597c2ffdb57759206500da65390dc1609a24e521e137aee072d1ee3412391bf0e4b778933ff2165
-DIST email2trac-2.8.8.tar.gz 108366 BLAKE2B cbe5acac3ca21f19ab630995173dd49b5edf30ebba1bbaf0c575c93d356f8337a1aa6e22c4dd526d6da80041fb8780ea41f773a56eeca5e986930243b34702ff SHA512 8b13d22b50367337e5ed939dc689e0fbde4a63e1932351cab6aac2da7878fd37c9a09ff6e9f9aa4a1f709f24f2808de5d25b494813e292f61ee9be973c601da5
-EBUILD email2trac-2.6.2-r1.ebuild 985 BLAKE2B 4fce5dcaab46ffbc3303dde2b00f29cfc48793cbc2f88e7161a76faf07e55b100904caf60cbfb932db0c697eef44dfc760c20e9cea58e57a6dac44c386bc353e SHA512 3bb3fd996dca7ea58d7a17f1efa0c84a5f459e619a02ec811571108e336a49f004ee73ec3f22b17259e44002731f54211ed7c37b97ab98ada51a3b092bbd5ba4
-EBUILD email2trac-2.8.4.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
-EBUILD email2trac-2.8.8-r1.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
+DIST email2trac-2.12.2.tar.gz 102415 BLAKE2B 33917aebb828b3ef10f1f3e0f54a652c88041c3c6e788ae5a5fc9ea3005a4632e114864171519ce24b3b89273d79275fd4d8da2b2b3ea1b957591a7155e9d17c SHA512 15b14d436f28092f0a9c3ecc0be0197d54085710b6cd651505168e14bf3c002ce4e218bdf2725a09c7caa2a1f72c83b24daf193eddc52658c8510e25c65a7c1b
+EBUILD email2trac-2.12.2.ebuild 995 BLAKE2B 607fff0b1d00a45d5f2d4d6c16f9664986dde29409df6611470a2244dfbdeb15a0fd66612ce3d5873c7a68143396858c84753709bead1dac09349794926c3ac6 SHA512 7972584300483a30232147f31c37f59729ea6a0a679780273a245d65d7c8da5a6b91f9d24b7da03a08377f8f2fe0ba96a7c9937c48e9afdfadc95db805234e60
 MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild b/app-misc/email2trac/email2trac-2.12.2.ebuild
index 06cbb0e81cb7..b0afc6f55762 100644
--- a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
+++ b/app-misc/email2trac/email2trac-2.12.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.1[${PYTHON_SINGLE_USEDEP}]"
+		<www-apps/trac-1.3[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
@@ -27,6 +27,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
 		-e "s:\$(CC):& ${LDFLAGS} :" \
 		Makefile.in || die 'sed failed'
diff --git a/app-misc/email2trac/email2trac-2.8.4.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild
deleted file mode 100644
index 8ebdae6ac932..000000000000
--- a/app-misc/email2trac/email2trac-2.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Utilities to convert emails to trac tickets"
-HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
-
-pkg_setup() {
-	einfo "You can set the following variables in make.conf:"
-	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
-	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
-		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in || die 'sed failed'
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/${PN}/ \
-		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
-		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
-}
diff --git a/app-misc/email2trac/email2trac-2.8.8-r1.ebuild b/app-misc/email2trac/email2trac-2.8.8-r1.ebuild
deleted file mode 100644
index 8ebdae6ac932..000000000000
--- a/app-misc/email2trac/email2trac-2.8.8-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Utilities to convert emails to trac tickets"
-HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
-
-pkg_setup() {
-	einfo "You can set the following variables in make.conf:"
-	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
-	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
-		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in || die 'sed failed'
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/${PN}/ \
-		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
-		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
-}
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index d17bb7b591e8..bc5ed161676f 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -1,5 +1,5 @@
 DIST evtest-1.33.tar.gz 19736 BLAKE2B 1b36207f67fe7db12bbe8d8db119f1cd4a9adc34b839762b198c29044a36e6fe9e8275d68a27204de4d287d1f12bde43f3895003fba9403a443189fe289decb2 SHA512 e8d6b76a2256ca6085ec07a66af913873ec5bc196bea87bca4f9b3e8b3222b34fcf636572383df74940b9b5db4a07f3e0be3ffe1454c605520da0c56f38506c3
 DIST evtest-1.34.tar.gz 19954 BLAKE2B 17ca600e89070d65f2bb95b468b921278ab63e50aa6042a974e8d4ac214b51355423c910bb0911e16a6bfc27e9fce59159719aae7d280679e7b292d02a2ee955 SHA512 5b4a18f13b86b1e2f5f723f6abb18c0a50d7f96b4412f46f503895c7ea8701a67a3237701de367c6b789533d8de887baa8f8f8e7e2fc4611235408ae21021b38
-EBUILD evtest-1.33.ebuild 582 BLAKE2B 5ced31a2fb4e2c827ab89f198c26f265144a910d04eae2afc11b7ad8b1f0509d434b51790db093867e8fc34cb15fc6a294e12090a0713c8c21000cd5833132c5 SHA512 7bcee32f3497b833ab86ebe0492b5d67e7b43604582d189276847b098e862ad53f4970b64a2918e89bde08c37057f996b2edd46cc8a9d9ec3fc16349a49b5832
-EBUILD evtest-1.34.ebuild 584 BLAKE2B 15efc1c03e763ca1de6f10943f81bf6687b8bd0051b4747b658470353a572dd015a052f46756b802bb0380c9386118e1c74d6b3cfa9663a678b042a1677df38e SHA512 94975b0c5a62d5b265c20048071757e61dca3b97ffd1bca7bce1ac1bd74635572716aaffadcc8abe7f628aa2b6126d9dc5d1266f59ef43cc904e7293f8251d06
+EBUILD evtest-1.33.ebuild 578 BLAKE2B edf2cd60d843f8bc9f928ba19a42c84343a18f58f9c9f2416b52fd64ce1f8dbd66e4e78dc7b76b4e45d1c7e403e2dae6e7b61860dbd29885ac3dc8ffc7cf42cc SHA512 b81257778c552857f5a629f6b4fef685ea1ca1ce945892c17dd0b14248f10bd30d0a89fee238670498d3c681725ded427bfa1af71ab3c5831f2f9bf62114aaac
+EBUILD evtest-1.34.ebuild 580 BLAKE2B 7703882a8351524001854a8cd263802c7719151051b911348ede05db06bd6f6e4a7d61f825d35568b52a50a9f134452024a5180f237a2955b39f5d01af387685 SHA512 9920f45d76196d4674541476b64f1d6bc58f2557e007e50f8c32506effaf64ddc819cb6a48f9922439643793e7ab3a3ec20146b448310cc8329696a94f6f4dd8
 MISC metadata.xml 241 BLAKE2B 25bcd095e850e5d5b0eb543070c829aa274b10aa3c44b1e21b5101a57f2cb66585a033aa9f93a8d4f278daa208b3ced7cd2d4f726cfb43cbe2e141c7915ba1c2 SHA512 7f368e04c0170689ed48a96f0a5dfade1ad0503dbf28eef73067d9c5181e760d94bd36c4f5558cab4bf244b25aa9d2311bef409d02ba4d186d83353552ec1a75
diff --git a/app-misc/evtest/evtest-1.33.ebuild b/app-misc/evtest/evtest-1.33.ebuild
index e282a07359ae..f21bef0d01c9 100644
--- a/app-misc/evtest/evtest-1.33.ebuild
+++ b/app-misc/evtest/evtest-1.33.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
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-misc/evtest/evtest-1.34.ebuild b/app-misc/evtest/evtest-1.34.ebuild
index f3cc4c44480b..7bb2f5d466ee 100644
--- a/app-misc/evtest/evtest-1.34.ebuild
+++ b/app-misc/evtest/evtest-1.34.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
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index d17b767f7486..101519171d22 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -5,7 +5,7 @@ AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a9
 AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
-EBUILD fdupes-1.5.1.ebuild 965 BLAKE2B a9ef805071da0ad7b7b6ee497c3b13cc2e98d8d7d634d71ab8787196f3db9b7e81bf7f667c445a769c24f4177ed6af7de1dd0dae439cfc2e9efa156253d67387 SHA512 e4badace248ae30e3e8d34d1d4f4ae5506e87209ba0cb4d03c0f5d4ddb70b0e5ea987b2622cc240040d04fc3b1ffbcf58431f92e5894e9515fbd72d31295e62c
+EBUILD fdupes-1.5.1.ebuild 966 BLAKE2B e68e295be16aa80d712fca947b259144d2a53bfb26629341b54699d9c1fa3547d4caae7713d15da3c2e75b21c3e241b10cc27cec6860d49ffea3a278d121eb78 SHA512 4d3eff880cbac6a6bbd94c5ad59ce229d8200deb2c8bae84bd9a89f5c346c49dd0f5787417f03d706271041d8752b4156a508cd977ed510c18f64820ae88ab07
 EBUILD fdupes-1.6.1-r1.ebuild 684 BLAKE2B 18a6313c4e2f3192c049db83278630ba938cbf8e48503f672b1be4ff6a3fc5e2071b8cda985ace481c3fa2fa093f35df9bd0a274cb8f2c376d0111fa1407e6e6 SHA512 84434c700455f906ecc95f8386117c338cad2150bbd7b5fabf5a9e4251618a0831410aa2e9c817e4a6971d2aee1477da44e5e1d76f5444422177469c1678f4f7
 EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
index fa42f7ffcd48..47746954021f 100644
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/fslint/Manifest b/app-misc/fslint/Manifest
deleted file mode 100644
index 48311e9b4abf..000000000000
--- a/app-misc/fslint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fslint-2.46.tar.xz 135988 BLAKE2B e4cd1187222f9a959c23ea0606263489d6cd52ae1e2f0f4fd4ac859fc516073f3d5186e7bc77a782ab1a698db182e7082333020b25a8f5a705bd1265d99e7ba4 SHA512 7b6122b5920d37548cfb05bb986cc29a86c7de9f549375923299c23fe19cbc8c6a521feafcf6df6fe0562dae8b6a4e804f24fdf5a833ea2b68308be41a96b696
-EBUILD fslint-2.46.ebuild 2155 BLAKE2B 50735ff899c78b9550d09063d97f5e0ee9f44f1a3bdce9e12edc3080fc4c429fdba28949068d47d9a139aaf0ed9acf2ff8ed98c2afcd4ffb0e0f2effd4e1525f SHA512 0155cab9fe7fec66c24b5e14a7f4a4899da862d44759fb5533b10767987b932022238ba78f59d37f77245afa68b4bc57b44d7da52e2a3b301a0c8e2e53531d4e
-MISC metadata.xml 250 BLAKE2B 4e66f9af5f8e38f419fa14400bb846409e25a994b97c5ea4576b86ae5b601776c81fccbea03201d3414f9eb32cd0d12afee9babdb5e864338b1a86bfdbfa5cce SHA512 aba0ad6bb553b7f17cc5865b37e6ab4d7cb932b9384937bd8e2c8b254f9ba39afa3b1df70b83974c58076339fbf62b60f26d69f789e349f02b1d89dea299ce3a
diff --git a/app-misc/fslint/fslint-2.46.ebuild b/app-misc/fslint/fslint-2.46.ebuild
deleted file mode 100644
index 6d500bd232fc..000000000000
--- a/app-misc/fslint/fslint-2.46.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-# The eutils eclass is still needed for doicon() and domenu().
-inherit eutils python-r1
-
-DESCRIPTION="A utility to find various forms of lint on a filesystem"
-HOMEPAGE="http://www.pixelbeat.org/fslint/"
-SRC_URI="http://www.pixelbeat.org/fslint/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	gnome-base/libglade:2.0"
-
-DEPEND="nls? ( sys-devel/gettext:* )"
-
-src_prepare() {
-	default
-
-	# Change some paths to make ${PN}-gui run with our filesystem layout.
-	# These commands are taken from the debian/rules file.
-	sed -e "s:^liblocation=.*$:liblocation='${EROOT}usr/share/${PN}':" \
-		-e "s:^locale_base=.*$:locale_base=None:" \
-		-i "${PN}-gui" \
-		|| die "failed to fix liblocation and locale_base in ${PN}-gui"
-}
-
-src_install() {
-	# The commands below roughly follow debian/rules.
-	python_foreach_impl python_doscript "${PN}-gui"
-
-	insinto "/usr/share/${PN}"
-	doins "${PN}.glade" "${PN}_icon.png"
-
-	exeinto "/usr/share/${PN}/${PN}"
-	doexe "${PN}"/find*
-	doexe "${PN}/${PN}"
-	doexe "${PN}/zipdir"
-
-	exeinto "/usr/share/${PN}/${PN}/fstool"
-	doexe "${PN}/fstool/dir_size" "${PN}/fstool/edu" "${PN}/fstool/lS"
-	python_scriptinto "/usr/share/${PN}/${PN}/fstool"
-	python_foreach_impl python_doscript "${PN}/fstool/dupwaste"
-
-	exeinto "/usr/share/${PN}/${PN}/supprt"
-	doexe "${PN}"/supprt/get*
-
-	python_scriptinto "/usr/share/${PN}/${PN}/supprt"
-	python_foreach_impl python_doscript "${PN}/supprt/md5sum_approx"
-
-	doexe "${PN}/supprt/fslver"
-
-	exeinto "/usr/share/${PN}/${PN}/supprt/rmlint"
-	doexe "${PN}"/supprt/rmlint/*.sh
-	python_scriptinto "/usr/share/${PN}/${PN}/supprt/rmlint"
-	python_foreach_impl python_doscript "${PN}/supprt/rmlint/fixdup"
-	python_foreach_impl python_doscript "${PN}/supprt/rmlint/merge_hardlinks"
-
-	doicon "${PN}_icon.png"
-	domenu "${PN}.desktop"
-
-	dodoc doc/{FAQ,NEWS,README,TODO}
-	doman man/*.1
-
-	if use nls; then
-		cd po || die
-		emake DESTDIR="${D}" install
-	fi
-}
diff --git a/app-misc/fslint/metadata.xml b/app-misc/fslint/metadata.xml
deleted file mode 100644
index 6e883e5321c1..000000000000
--- a/app-misc/fslint/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">pixelb/fslint</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
index a1798e4ef37d..afd2cccb499c 100644
--- a/app-misc/gcstar/Manifest
+++ b/app-misc/gcstar/Manifest
@@ -1,7 +1,4 @@
 AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
-AUX gcstar-1.7.0-gcstar.desktop.patch 796 BLAKE2B 052d2d3325c04e1d8bb64951cfa43b44d1fa85f7c11326e2d56b04e8c5a57e70dc7b5a6758ae27186b403d27a4fd3d1ffc903c761c7a0a98b7430c4ef3602d56 SHA512 59ef9e55ffd607723b0cf833bf666ea4661db3af14b45425ba4b55de1d6144714eddf4cdbe17caddfa5a2876772c5c387a0fd06354c44fc8f3b26b83bba56150
-DIST gcstar-1.7.0.tar.gz 4506937 BLAKE2B dfc6f53921ecad73676fb9943f87dfb3c465347e4d4783f1efc29ec75c35eb56ecf97f9eba6121eb22740642d186d642a3384c10ea8ef6a8b42664e1c2a056e3 SHA512 9cb22a7ee38bbeae67ffc6f649ef6e988da43a1f353b027bacbf14ffcca8a4c12ef28d64876b2171396315eae95f76708a1307255eabc3eed6776137e2ae7090
 DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
-EBUILD gcstar-1.7.0.ebuild 2983 BLAKE2B 5dea9b2b2e74043d0c015bd975cf2b84cc928862f871c8c0833dfa92ef7db4f13d99de145987aead78281a1936199b3efe7059756a90cb72c1b2ff85c130a69f SHA512 dda33ea7ecd94915c9777448fffca7768f53e12e85af730a1b1e9af343a7596d6319a06b6ba9f58a38cefa0db8d972cbae43f17a0fdb52e238480bf03c523b4c
-EBUILD gcstar-1.7.1.ebuild 2172 BLAKE2B d6b0641fcaa802947c08096c8a4eac18ba7615a7d0a30fdabb048be8dddbb4140355bc4bd5ddef33eb3054b2d08eb08fd86fe0a2a804a4724c3c844ad9ac280f SHA512 99e26e221e53648586be1dacde738076d1a3d434d57d7f83f1183201d504dd3582b8e079595a5ce095368bafa4d1a362a2659d66bc53bdcbf1a09ce28baaec8d
+EBUILD gcstar-1.7.1.ebuild 2167 BLAKE2B cc51012ca9e68c82b96a651e264f8bc3652155570af483c229c5a0c89e0da0d1e11995e376350bae47394aef065c5e7378865a29fdc906c7c76048c0af567cbe SHA512 af3fa39fae4ab45c94a9c0f7dad8c60565479c35c797b5a5d0aecf15553b47e5cddbd0e5b3e3d24e05b915af129ac1ffba2650dc9c64488e30d0a5b01d993d0b
 MISC metadata.xml 878 BLAKE2B 08bd6224a9066bcd47292389f3718d5378934bcf6b76c2d969f0703003ca50b725429dd3c336b4cb9021bd3dd0534d7ec7a5c1b6030f8338b952ae8c187c20b8 SHA512 b086dcfa2d846aab85f413600ba9f8db1bce21d6ff2463d7fd2f4328c10a5343013b049bf5143c0591f52ff111415ddd2863b09d634fa3cf124b384dad4f4dc2
diff --git a/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch b/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
deleted file mode 100644
index 62b6a7b47401..000000000000
--- a/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e78617436de63141cd4ff6e42fc0391a9a00d80a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 8 Sep 2012 18:14:40 -0400
-Subject: [PATCH] gcstar.desktop: MimeType list must be terminated with ';'
-
-Needed for gcstar.desktop to pass validation with desktop-file-utils-0.20
----
- gcstar/share/applications/gcstar.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcstar/share/applications/gcstar.desktop b/gcstar/share/applications/gcstar.desktop
-index aa6a46d..c7a146e 100644
---- a/gcstar/share/applications/gcstar.desktop
-+++ b/gcstar/share/applications/gcstar.desktop
-@@ -15,4 +15,4 @@ Terminal=false
- StartupNotify=true
- Type=Application
- Categories=Office;
--MimeType=application/x-gcstar
-+MimeType=application/x-gcstar;
--- 
-1.7.12
-
diff --git a/app-misc/gcstar/gcstar-1.7.0.ebuild b/app-misc/gcstar/gcstar-1.7.0.ebuild
deleted file mode 100644
index 0eb9c9eb8cc6..000000000000
--- a/app-misc/gcstar/gcstar-1.7.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Manage your collections of movies, games, books, music and more"
-HOMEPAGE="http://www.gcstar.org/"
-# Gna permanently shut down in May 2017
-# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cddb gnome mp3 spell stats tellico vorbis"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Archive-Zip
-	dev-perl/DateTime-Format-Strptime
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-Parser
-	dev-perl/XML-Simple
-	virtual/perl-Archive-Tar
-	virtual/perl-Encode
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-IO-Compress
-	virtual/perl-libnet
-	virtual/perl-Storable
-	virtual/perl-Time-Piece
-
-	cddb? ( dev-perl/Net-FreeDB )
-	gnome? ( dev-perl/gnome2-vfs-perl )
-	mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
-	spell? ( dev-perl/gtk2-spell )
-	stats? ( dev-perl/Date-Calc
-		dev-perl/GD[png,truetype] )
-	tellico? ( virtual/perl-Digest-MD5
-		virtual/perl-MIME-Base64 )
-	vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.0-man.patch"
-	epatch "${FILESDIR}/${P}-gcstar.desktop.patch"
-}
-
-src_install() {
-	if [[ -n ${LINGUAS+set} ]]; then
-		# LINGUAS is set, let's try to respect it.
-		pushd lib/gcstar/GCLang > /dev/null
-
-		mkdir tmp || die "mkdir failed"
-		mv ?? ZH_CN tmp || die "mv 1 failed"
-		# English version should be always available so we will keep it
-		mv tmp/EN . || die "mv 2 failed"
-
-		for x in ${LINGUAS}; do
-			if [[ ${x} = "zh_CN" ]]; then
-				mv "tmp/ZH_CN" . || die "mv 3 failed"
-			else
-				# GCstar uses upper-case, 2-letter language codes
-				d=$(echo ${x} | tr '[:lower:]' '[:upper:]' | sed -e 's:_.*::')
-				if [[ -d "tmp/${d}" ]]; then
-					mv "tmp/${d}" . || die "mv 5 failed"
-				fi
-			fi
-		done
-
-		rm -rf tmp
-		popd > /dev/null
-	fi
-
-	# Yes, ED *is* needed here. gcstar's install lacks any concept of DESTDIR.
-	./install --prefix="${ED}usr" \
-		--noclean --nomenu || die "install script failed"
-
-	domenu share/applications/gcstar.desktop
-	for size in 16 22 24 32 36 48 64 72 96 128 256
-	do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
-	done
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins share/gcstar/icons/gcstar_scalable.svg gcstar.svg
-	insinto /usr/share/mime/packages
-	doins share/applications/gcstar.xml
-
-	dodoc CHANGELOG README README.fr
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/gcstar/gcstar-1.7.1.ebuild b/app-misc/gcstar/gcstar-1.7.1.ebuild
index afc8b8f716ae..0406723f3796 100644
--- a/app-misc/gcstar/gcstar-1.7.1.ebuild
+++ b/app-misc/gcstar/gcstar-1.7.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="6"
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb gnome mp3 spell stats tellico vorbis"
 
 RDEPEND="dev-lang/perl
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 2a43ded2e802..c02bcb6fd8ea 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -3,10 +3,6 @@ AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da572
 AUX geneweb-6.08.01-gentoo.patch 865 BLAKE2B 25fc6d494997de4cd053757d0e18df4cefd677c959b3ce6edb5ef2bfbb896e6db637327add130ffcf8fdda06b69465ec211f6fea23c59b5b3e86af7d2752c030 SHA512 a258145e5d0eca1a286ac425039ba3ddae838a2820c9dd6d3537e65a959298b9a75ef1f32737ff5286a5f76849076830ad08ccb6ec0977f43ea322a19c9d159a
 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.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
-DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-EBUILD geneweb-6.08-r1.ebuild 1958 BLAKE2B 70ac814ce345ac8e26461c82551323f56d8331644977454f704a774f9b84ad76560ec2f6943c16271cf81cef4925f616d8125f26557714436b77a815c51e2c38 SHA512 2b992d10ea2307d2b2bb68b28133844874bfe8481427b549d8e404f84f5ea4b2ed8dc35d158af656b113ca8787babf1f0c2d126c95216c1662deb7f71b4de951
-EBUILD geneweb-6.08-r2.ebuild 1946 BLAKE2B 84a5c4cf29cabbb0e1d3573c4aa5739fbd80dd3df47fb813475837e1671f654dc1cffe7f76573de856212500be85dd6e1faab594f0df332fe3bed0d9e3bc9234 SHA512 8cd06829353ca61ad95af45bdd32076c642710cbc63509aea8c431055c44715923515bf3a3389ea1d84a3bdae9e54c78361332da284d35bd617d5643ddcab955
-EBUILD geneweb-6.08.01.ebuild 1944 BLAKE2B e64434246bdb46be17deefd645bf87083b1a135454d756baea8d005be7cf7192bab0f0aea4113baa1cfcb9221f5d10a6fd0949e097128ff4718a521c5b31ea5f SHA512 0fb8792267d569b0e29ed0399d8076ba4f118f659010e25871496b06537a67d0f886176528883c172a7bdbd34dcbaa7e435e3f0fcb3ce797f9b5cdbed1442f2d
+EBUILD geneweb-6.08.01.ebuild 1942 BLAKE2B 60180823289970e8bfe1e739a93494d0726d535e6e1063bd04c9587522fbcda7e6fa01ffa166c8a70c45d3e2f4d7daee17e836ca4acbc58745a434e8dae03f11 SHA512 3f37020d226d86397844987bdfb45b6c478ee6710ea230f905f3e0311c3267cfb164af90234556e613caf5e6e9d35512364c141e61c9fe313bb4697effb76ee3
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
deleted file mode 100644
index 55528f558666..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-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?]"
-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() {
-	enewuser geneweb "" "/bin/bash" /var/lib/geneweb
-	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/geneweb/geneweb-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
deleted file mode 100644
index a962e673485d..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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}"/${P}-r1-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/geneweb/geneweb-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild
index 70389b658f0a..d3f5624aba46 100644
--- a/app-misc/geneweb/geneweb-6.08.01.ebuild
+++ b/app-misc/geneweb/geneweb-6.08.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 RESTRICT="strip"
 
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index e38e951aeb3c..e35871fa78a8 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1290 BLAKE2B d7a18ab5b6654dc0dd7dd64ac040f66956b1e05fdf0aa1c30950d5c95738c788454fc8caae68f584655b70c6681729dc2a7bf7cad86ac524f6f8d8e3aabe8199 SHA512 8d4226cee90afa68b7859c58f3de6596d679c8f168f6403b3d7443e5f2527c73eb3cab340e5338b3e37fdf538a4632b424aef8fc5591a6f298c1267d97b973ad
+EBUILD gentoo-0.20.7.ebuild 1291 BLAKE2B a66c1f334301f003cf86037136e4ef997c22152ce0d04496c2d2ae33a408d0ee91f9ef0de2046f9ee4c158acdc56ab219add0316014215a3c08c10c759286c3c SHA512 962cd07ff93bb4d7fe2bb14c0db15f5a33115ae1682c7cd9bd1e59b2e1bd1824f6d5785d92d4757ed609dba0313d535c881467e9c5c4c971dc1f1089539c1612
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index 97b5d95f31dd..26e5fd720d81 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
index 0ffb57884ca6..5c06237f6ac0 100644
--- a/app-misc/glimpse/Manifest
+++ b/app-misc/glimpse/Manifest
@@ -1,4 +1,4 @@
 AUX glimpse-4.18.6-makefile.patch 1048 BLAKE2B e937f045dec826e5660ba4f38e4f6c9dd05ee4cd71b5b9044d5c9f24c22d5ad91745d526638b2daebf29dc8ae5b0fafe0c30a3f13a46193185805be7e61a730a SHA512 568b0cc6f52d8ce79e5ad552a302a814162072b85f1a3b7bd2b00bf18ae2d7526429f68f6910d9fb91ddcde43387a2778f9f61ed3f86f0fb533b69946cfef0b7
 DIST glimpse-4.18.6.tar.gz 812595 BLAKE2B 427ab2523236d9aa04ad789d001d5234483842f4d8d812a01b7cf2adc9354917da2e95df7b88917d8c0a282c7aab67bfd2cfbb87a6600a31fe6b07b6936137c9 SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a
-EBUILD glimpse-4.18.6-r1.ebuild 1436 BLAKE2B 1dbe1681f0835da69bad22c3a60f74320b2d95777a3965a244649db898187a58460325207133974e4f337de78c22dda9b5d26176ab9ba9214f8cf3af8aaea083 SHA512 49c163e130b97e79bc96bc39d2c648f098835ffb40583782ceeed23e56e311e34d9c475c3cd2924982fa6f52ea84733a621dff370f8105afd88ab64cb859978b
+EBUILD glimpse-4.18.6-r1.ebuild 1437 BLAKE2B 055280d5923df3ef5448ec5307e37d3cf5095830585c94adac7c73f845a638749f3f4195ced10ea03987a3e030d406980b9d40ed7ad6bd063483fa5e195d82a8 SHA512 d44d693c72d838a320c3e9d3fb10bc13c307978897d584c3d33c20b68c2e758ecacbf52741c1a0c79cd4cdc3cbc16b2d1ea03ee3ceb0321bec9c16402e09ec13
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
index 382559ab96b2..14d28ff9f368 100644
--- a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="static"
 
 RDEPEND="!dev-libs/tre
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 3c501c831140..b974d98b31ca 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,3 +1,76 @@
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip 38193 BLAKE2B 13e82289c645e2a34250f8822274767c45c79bd6e54f505f20995c0c17a83b807be68b490c481fc9595637dbf2e0da4494cc230763a7138658a11aca9cc6b3f1 SHA512 4500f7ea6c626f82689009f5439d541a048918a986adb2d5e2d629fa96d2877783a33bb0c059a510788722a8ebf324c6c6a7ebc23174d1d9e7842cf5da55a96b
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.mod 36 BLAKE2B 39effbee6cce58e89a4f700e32424a1353ae2c4410579a0cdccce4e5e44cb2e8f0bf9c5419eb199628b1be549d4c3deb890a3675579997096ace6393ab5267a8 SHA512 86c3285d609dcf781e8ac5d63a6d320af0cee0465e7071caa925e5c7cb259f46451b570c1a6c122ebd6b099e2fc2a5ed4bf6da7fff906a62709982649cbb9a72
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.zip 58411 BLAKE2B bad6282c6fb208c8730da8df64ebf019613016c67118d3c4cb2f38fee5d78ff4bafe923887bb7cb9dc0cdb301df77471904933786584834c01a0a41efdb32b7e SHA512 6e26de6711a9e02c194afa15badbb03c378954688b07519cc9fd8045419ddb3e0b85d4dbf6aaf8de33b54b5de653db87c744bd37682021bd393f8319d6308894
+DIST github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.mod 36 BLAKE2B 000094171fec75b4e45d40bf820417400401971e3f18eb68588d15466e709097607b89ba18c8d8b6d2d658e4f718ab0662cc605c76c955464d9e6d45609945f5 SHA512 a1e0fa80fdf59962a05f1f6b1232c17f301010ada93a8628a89ea187de325c75f7d85359306c613371552671ffef2e513938e2d2ff57731dd2b226a54f87049d
+DIST github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.zip 23443 BLAKE2B 6188548df580d0131c8d5cc15857f6651a052493a54d80b1b9329a1eb50edf847487c6822649a67041e0491d0410bd1b73f6f86f187a255a0f6a0c2183c30a14 SHA512 b2f2369103ff57572895a6d9294826c494c93976ff30ff4ed5e0876ad700fa48a7366bf159d81b6bc7bf46ca15def81678f77405d696607aea4cc01a677709ed
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 66023 BLAKE2B c023de8e6a5f0b13a7ad1484f21f04643782d802becae77f247709f0c16ab8aff7caf748736561138448efe1cd52c0ac1903b22b92ec56efe817935ccd45ff22 SHA512 356c87eec65f0dc8a680b7a19e888d87fb8c808ec675501df635560fd5d3b57da36ecc2cd9eeb4a5e454c5564d4cf1a062b47b7a050e116b57c87afbe020eb53
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 5176 BLAKE2B 58fdc8010b4ee8363336ef720c8ef2d126c2b7dd79357ca4f99a1094957965544430420f6ae4155490f75242cd7a7cd20993a9ae15087ccdf33327c551caff59 SHA512 0dd4cbe03b224bfe68d00d121f758796f6e63b96eeee17261bc7d8f6ad1ef9878976b8eae5eadc2f6abee28670a83e6925596f4d35bea529fcd735772fc9a049
+DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2447b3f6b52bb0ab4eb8af5ac3ca818b65bff046e0743cc8d8dd3d7e336ad121a8d017e3f7d7b83b0203b86392a82cdf56641acddfcd377a168553dfc28f3ac9 SHA512 f7d31069b4207aabc1683b00d85decf9e883387d598ec9125128724cad3b7d1f3462ffe616486e35579c97b178d703999c243a3a3aaca9223d9f661c07fe9d03
+DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip 35021 BLAKE2B 06b4f88edb2e79b8a1776ed4b519b0f72314ef90761d6672647c1b5eefcdad4cb4715281a55b7de4c991350f401de98eaf26f20933964fe38b30dc2312f53940 SHA512 b8d346004622c7060aa4f25affafa846c7abc7f6bd04b87f53ef232f229d00d6721f139cad102c3d32eee711a82a0c814addbbc6f42e8109cc4bf8650d0aad43
+DIST github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.mod 32 BLAKE2B 45e918abf9e678a91357b105c7629be1e63460a8a18e829b876993d47a4bf70c1c1485df73892a6403cdd9aaa72c016e42bdd07ceafb84f4df9805ce26e8a090 SHA512 97fc3baa39230bef5af2c7157fa38b3111c63898e7d168bcaf52b669b395fa1e06cad07b2266ab821dbfb683ae45f7b1feb0d758d31dbc8fd304fc19a8b40d0d
+DIST github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.zip 40252 BLAKE2B e05dcc1ce7a98bbe077d0bcfff8b29880c495feda9b794f341019fdf5a2e1f2e65785a1cf8f66ced255d44cc39a5be676f8821c3f05b72a18a395aaeeb2db782 SHA512 208b54319c8264c70529ab165e874c508f69686b7aad7ac1b3bb82d55353f7cdfdd195bae85b4c7f3a86babcba73ce0c25f7feec62b6ac70bc78ca3653746a28
+DIST github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.mod 32 BLAKE2B 45e918abf9e678a91357b105c7629be1e63460a8a18e829b876993d47a4bf70c1c1485df73892a6403cdd9aaa72c016e42bdd07ceafb84f4df9805ce26e8a090 SHA512 97fc3baa39230bef5af2c7157fa38b3111c63898e7d168bcaf52b669b395fa1e06cad07b2266ab821dbfb683ae45f7b1feb0d758d31dbc8fd304fc19a8b40d0d
+DIST github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.zip 40989 BLAKE2B 8b1782b15dbab0c0386386af920fef646f5493025bfce7d3c852a7a0e3b70d3f27197faa4c1726c51fcbaf31c9f7eb0a1570c4c47ebc8fea6a1320f008b785bf SHA512 c8d3c9c10fb74f48f5345584f878cb0c922be72850afe01a99aae355fcd95f11d8c4acefca033aab6dfffdd7eb63c00e94a018e20ca21d5fdf5b6fbab4ee1ed0
+DIST github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.mod 33 BLAKE2B 96e55cb2ff57a16322287fe49d959ab6e042f7b02701dab84627f0eeedb427620dc13c82d4a21cc6a9470bf686a0803abfa5a5b6af6d585adcc72c5689431ec8 SHA512 44c9c557a89b26949f819cdfcfc11e578dfe1801d1ea7e4ce1d3e50f888440ec4fa3504e1c8b5a2bf98b2d17a2cc1321b4dc0fe96d1aa8de8672581bcc946a30
+DIST github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.zip 7100 BLAKE2B 2d86fbfc82ac010fb596cf302bb014da961a18ebb67c2f4f681de0fda3e8150de8dc0ced0ca72a728cea26fa7fbf35695a286212272afcc653368e7bad2dbc93 SHA512 bd83cc0c398775c44e8f811ff5d5fb7815c8f37d9a153a1794e7862adcb4f1fce6b87110949a9da249a8a36b412ee7a3af1455c531cbf235561e092c6cfe283a
+DIST github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.mod 29 BLAKE2B 5334545d950266de1033a6b995b61cea8b24529ddcab15b00cac83d947cd44a995c4f24e5fc4efb0dea6501349281435e59d9a2b35706f6ebb3c83c291cff148 SHA512 06dbd23c66a059cf000a16c546b023475c53caabee829deb6a1848529d55364d5300a62841f292b561e4e6bb41ca8040ae889e88029718de58b30341c1e4bbb1
+DIST github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.zip 13850 BLAKE2B e24fb07fe6ec251584597b303bbc62f8c1231b99286898f29bf1dc7955e2b1e266693cca80343cff70cb046c7c46ed6a5be507ff0fe0e32714f607221c1f4a37 SHA512 8da6acdaa6f8145a75b1cac3b1006aed639a4c728f7bc3b0c13da24ba580bf54fae8ce4ea0512f1b548b4b4cba3900343ad402ed4589905bf8f26761dc58017f
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip 4266 BLAKE2B 962bac7897b7df9172d558894454576e60a8f0baf852e19ab80e658066daa611cf59296d715deaa4bccd4494ebc81e5da32d9d723490834c4a764c6cc39e5ec5 SHA512 e7e9551abfed9a626f8054630faa16cf7ce23122e810f0ac36c3dc63131b142d8c23b615164f54f2a6669721d0bc5ce0a03973f5e547b86fa79c0cd94e2197d4
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.mod 34 BLAKE2B 5572dbfdd37d7afbeb92db22e8bc3d56290a94f75da52dc19529dd78c1cc7d837299320a2a3b39c7a611a8d85a8e6bcba6955ba5d68fb3f43303b5db162ef122 SHA512 f6e8c3d792032a50394f49a5ecf9470cfa3ead5b3a044a8a079345757cb2e4dea08a54876f79555b3a6c5618ba4674301b454cf47d0f046b68018f269960d7b1
+DIST github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.zip 55837 BLAKE2B 3ea51d5d99ed00f4a6394ce6688eb7bfee1cde84ab288d38dee019dfad44fb81b4d6023e0335e1e3bfa65e488e59d0f53f05165c816724ed3b8b58c29a8adbec SHA512 ffdd9681ded7de2bd1bc4120a6874fc3e2a50dafafc7aedfe63101d4f7fb342bf5917b91279fdfe23b8fc8f7ede0804987b45ab77eb2fdd92efcb23189694121
+DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.mod 32 BLAKE2B 4d59f879c5dcc4dad7245ab234981ff0906c2c3ab979d0e264fba1741785e5bc33a20d7177c58a8cfbfcd2d0f7b83ff141634bdc1e277b70fd68d23e83e9c5e5 SHA512 acf5ab31222c39f98b7bdbdeeaea6ac7daa0acd3440de82fe67537da6c735968bc442901aa3617fbb02602d5d90f255fc92501c1239a62e6f57c683990588cbc
+DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.zip 22611 BLAKE2B a33ddb1157fb2c5464650f107a759a39f280a28cf87646635eb0874f6e48ed4db9049a7d52d59cdf38599a488b2de2dc46d577d3759ee45881837b362991635a SHA512 373c04a5c02eef7b972adf8088fc63b023e4da6a14431a5249ced70dbb4f31fcaffd37e627970d06ed11623e37a83e6ca6be2161202a014a944ad67a72834c09
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
+DIST github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.mod 32 BLAKE2B dbdc0379ce57eb6789f2a47f6b9e93238780365f53b888f515e17de9dd5fc1e06496a1f0a4187c78edc1cfbeef9369eb12d38adf8903df84596345bcf0474cf0 SHA512 8abc225487ceb3a83b4c3739fcf5e79792f41b1e1933ce05df12eac42187917802b43c920da043b8dd28846f3a40657b69c851a90e9b79979a13f81b4da4042a
+DIST github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.zip 7693 BLAKE2B 75b03a2c78638b27b3a1e61172041da200a69991d1eb88427b21b50f470306423e0bc628290485bf2ea3acdcd9e4bda8718d3ee4e7a945379e1abf229ae902b1 SHA512 cf5ff579ff034850afe7ef4353674641a8c749d93abcba7f75548bb0211f1307d5f4d513e82525cb68e7f20b5a93cce612176479c14f16ccc3b8ca4f8290756f
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip 14830 BLAKE2B ae8107a401c7eef33c1354ad83f6de205c24b0b2087ec651ee372c08e9cbf90e6faf9fcafcd0e6db3401f272095bb8f1a17e7af73d06cbeb676abdfb9689f352 SHA512 ec8a93a29e45752634645bcfb197013295ffe6903ebab674073af64fd116addec1cacc46d0354f7104bcdd63338f8e04bd9821ee68094b4ae2a31e3ac3c4cb85
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.zip 19084 BLAKE2B 25ef98ad68b5c09f30a022e01b72b19a65d94227869dec715bfe4500da6e831775b45b1bf250b30f0d4d88c99b67e8cb82a7ac8021671060d067ab78e4a5a48a SHA512 2fdddfa840e46313407268423729c6d7886acf78f5aaa9de7d307a6e53c513a095bbbe50dabd49a10c48e43efffedf80f57a7bd715488100baab69cb58cfcd4f
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip 7444 BLAKE2B aa8d4a83365fb9de2c184015be855c1bb9a82772fc154390a13cf95bf5a755beb3544111e90e02121e5251729bbf0fe072de7b6f8f8ca6eccb2585430e88a839 SHA512 fcd99a4e9294362485d8f1f66283416c53b3079bbfdf3e9d1849fc1a9ebb61970563a9fe479f84fc9037f1fa7b820291026cf4072a3c81df2555876d02d99eb7
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.mod 96 BLAKE2B 5f923f8ad64702df318058cc4caae206fc5d780e024b0fd3fc242aaa16f6372c980802134ac1244d61467b2ee6f7f470c538d5558afb5c7c6f2af84855dc5fea SHA512 ca249b01b9f5c81ca7818c1ec2c1527a5a615a255231ff9e2191033c8b48cdd60753a2a6a294e1358176c6f4b53ce7d6698ce15e6f30cccd42328595562816ca
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.zip 24724 BLAKE2B f2a763aadd785324adeac9bc1d69a80c6d7086b3e44219aa7d6bd11bf545da1b1de3f6fd63cefd5ddca71e652dfa9d496e8afb59afb9731d641d0174e5185a25 SHA512 c6a650cabf6d5f1b96f67f7ae703259b6b4976564255933d0643213d4ddeaac85f2760286fade3dda6aa8a28b700e1fb6290d3a22886fc739bdf552e67ebb143
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.zip 5677 BLAKE2B 3e6ef3c38fcaaf123001a56b1508b1cdf8ec5e1521187d610d529e90476b25913e8c0c09f433995145a2dc4b708a2e5d27e53a64efae8afc819b8f485bba06d4 SHA512 39e02b81e30dafab464f5ac97fd5ba225b46e0e60cf45b782d923ca0daf76757bb517ec7cce037aa4175ea37819c1bbe6ddd65f57581d2d5e6352279f4218dfb
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.mod 36 BLAKE2B 1c7a0a50d76e47c68c1fa0cf33ee0b27d184e7740ce6608bad37cf8d2661420f7087cd81a54cf15a6c7ce87032b9479bea584601110b28772ffa94a6d1345335 SHA512 c2c9dd544a7dd7921761a244aa3dc8ace5b1f0bd134455f72af82c5a2977acc90203697ee2567f98b248878536fbaf5141e9c0f9671c8fd157bed4de855760a2
+DIST github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.zip 10754 BLAKE2B ae6b7521605af740c4963ea5a8413896bc1ffd1c3a80132b552faa560f8f79ca1cb759d69e6e72fe381273edcaa47de382b857aa3bb303eca105b658f3baecbf SHA512 575046f37d8969467c4edf8212c367dc7c20a000340dce6318082cf6ddbfc4e454365968925cb252d29ed0f1d6b2e443b9229e56985406db861490546b41280a
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.mod 32 BLAKE2B 26c3e737249d2c92e4a5e1c48119dbbde229952cc79a6b38d397b48e97f61ff1fa3f4832d4c8b9a29a18088960a7e61e175b000e5124e22874cad23691e581c3 SHA512 ed3278c78f0380454ccfb3beb87f07b32a6c07812961bce78b1e63948a5740969099f89f8f3385addff4224a2af56c8cae2bbfaccd3455eb9c9accbd2af3c671
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.zip 42334 BLAKE2B be075938e08467d869448dbd681542e353842e005bd6b390a29927742115f8ba3d31661728fd4acc6c4588696e5265f5c031fee0002fbece8ebbd7a85ef695f8 SHA512 183687543756ee17e350e5c0972fc4e146ff467e309db69b98d8b3b5782d2923070c9926d90636192c9ac23dbfa40582d095b458c918015ab2acb2b06318e50f
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.mod 32 BLAKE2B 0352a43289e6d2cf597bdd8f2979d70ad3d11a415ad38d5a334e141b1d818fb605e847f4f988ac021ffbf5b2984a36f0ee28c0d722c30919921e8629ae9c6454 SHA512 e4f197f4e75c8936e7a7e1f6cba2f6bc5d7be5a674a05d7b23e1901fdd9a4f638a377c1c82ff6c0e9615997fcdfbe59bc35a9db43427bb48ae9cd21a3bae98c9
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.zip 5001 BLAKE2B 47d77672105ed21ea385834d0151fe5b87f13fac150ebdc700227046e888ffe4997f4ed9e7016a115e400899f2186985d63fc14190b433beaaecb749e6fccaa6 SHA512 75cee78b07441fd8ad472e4a6ff205733bbc111cea84e2944297789b60af15b33e82a3c8f222a3d7927f1993e6462e659e1dbe618d93cee987046fea5082be25
+DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.mod 30 BLAKE2B 05ce47a24391f36a8b83c6e3eb435b0487d76e94bb446511e448b761d201d0078d48704d6bb7f97f9b11117889e1c27056af5bf805db4766036b12ee4112612f SHA512 e05888b5a0b36d73c131f3522633311e919067dc751af9892b4b784b576ef4c76f816d2204c59e74c615e2f6c4f5fdfa8ca0d38d61fcab14c68dd100609f897c
+DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip 7686 BLAKE2B b09bc829a9ff39c0985d8a02e7400e35dbd33a3c48ea22e8a07872fb120b10129f4c230b3ea87cafd56c7b1fdb7cf73c1919af0679e8607690a1122d6421b50d SHA512 33439b0b3e31496917695c9fcfff87b8206a66a77362ee54356d0272bdedb95d7b51e031ce44cb6e1ae105ba6bf2dd17033c544553613311c8e5b4f757955aa5
 DIST github.com-AlecAivazis-survey-v1.6.1.tar.gz 976163 BLAKE2B 331ca2a097feb8bed063eb09976ce5ccf71c5d1c74f6f844d83786f9e476c1f630f95f1e87974578c6002b46d4221ab15fc4e9de529e1647660445a933ff1d64 SHA512 7b2dd3cc0f9acbea141756c5c4da791559578a6317905cf12ce894524e9bbdb9bccb6903d27e8142ae327be0db5cc27e599064907a7a246f87634cf45be57afa
 DIST github.com-alecthomas-kingpin-v2.2.6.tar.gz 44383 BLAKE2B 91841e6353af639c9d1ad4ecb0fec797ba1d497c223c0d457e1999dc7560a84e1d75f209f5a18386874a499939c5c7d6a450ed61ebf265b6706077131fda486c SHA512 09c6bb5782639efc7068ed7606fe22c463b2397dc95a89c27ba567a58da10660bfea60d7836b63dcedf7db702f79fe7247575c33a503990f5ba6ca92e29b06b3
 DIST github.com-alecthomas-template-a0175ee3bccc.tar.gz 55291 BLAKE2B fbd48545b6a5809d210629ca3aeb03c366051601d5b2f7718f79a96ec18fa09f18922c1a3ffcbac3abcd9b8955871b5bb4c71c23a1839cf7f17d8372bc3478fe SHA512 5ca546170725c3bdd4d9b27ca3976d6dc6376be8db685e6e26cfaef4a51560f78702b7babbe5ed0b2d934d0c32867bc69b11ae757071dc143a4453e6e7ffabdf
@@ -27,10 +100,29 @@ DIST github.com-theckman-go-flock-v0.4.0.tar.gz 6763 BLAKE2B b59fa02376e06a553e6
 DIST github.com-tidwall-gjson-ba784d767ac7.tar.gz 40630 BLAKE2B 1bbacc153b676ebfe50feb0d17ce850351662a8209116422134238c13d38811b3cd19181ac53428ab682ff3d32c7681f2c650b975d11301f415a73974c98d800 SHA512 299b6e6090cb06f56450d150a0f90618def2d5ed5b69ff4d5f1f4c54c83745b08f52d4d7c4965d5bcaf1c2b83a004c02e9d139a3b232748b774cb4fa500be0b9
 DIST github.com-tidwall-match-v1.0.0.tar.gz 4278 BLAKE2B 143b216243cfc056002613caf8374542cd0f941900de1f8f0dfe78c4b4a71b389557802b0436eb2cbb06be939492bad680879896ce75fb09dc7758995f786c54 SHA512 a107d12e6400ff08696831c108b1107c56aff31af5c1afbe92e49164d55de9cab61488e3f28516acd7e2abcb83e7813588a2579af2625cee8aa9d63ac6e9ee0e
 DIST github.com-tmc-keyring-839169085ae1.tar.gz 5133 BLAKE2B d3b639d30174aec648e29d222a87c43a0e7b6023db5d8f23e5ff2e5c8b737f1ea099fb88e3d9b676685de3a79232ec0b3332c870acf2ca416b03e269c8e5e46a SHA512 d1c268681ed59312be3d60ce406fb6139bd8fef875161adc64ea8c4077feabba639fa43e752dda4d95340ba22bb4cfe9df6cff7d5f8cfc13180b5384e33cc4d2
-DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
 DIST go-jira-1.0.20.tar.gz 1292990 BLAKE2B 788dada892809df730988193e50bd1033b2efe4398cf1374c7c2a08c197e10215aa83feeb2b0573a04c7de72badf83089cd45da85d0e60a31d0fbf41615debae SHA512 f07e1fa6e24fa29a50e348490b0ebf6f3dfa1c1bcbc8420320f3c87b3fac74e6ff1d9acb8936fefb25debed2411508689f832eb19ce09f1c39657942c092220e
 DIST go-jira-1.0.22.tar.gz 110574 BLAKE2B 0d30ea3f6c29a1d903affee3d4da69d5239b1826157a5b461e008334ca18cc15d3ed47e90e02c84db459a9005e1475b7f6898b1fa60a64eb1b3c2e3c20c0d304 SHA512 533a6da6c85be585374da90a60e44caa975babc4906711fac4e2194e6213aecd4159abe7a223e4c5364a98e4a18dde098a725cf8c3ccd79a44f2ba3b00d5c856
-EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
-EBUILD go-jira-1.0.20.ebuild 682 BLAKE2B f84e1b3a3791b2ed02f85d4362d6351077c9b720d1bb10451430d718ec00d501c4c3436f8284c5f6e06c9bd0c0af53db55b6337bf337e8e44fb75badac9c9ea0 SHA512 b373767742339c8a03ba0bc82226354fa0dee314fa7a4c6d98a17299e7a343008b556e27b6e63028dfa23919fbe7cc36ef19ace34788a0fae5aedf013d033c1b
-EBUILD go-jira-1.0.22.ebuild 1879 BLAKE2B c74793154559863c85c7db999a8e393fb7eb45ce40c6ca3aec606a82cece488731563603ae18f64ba05c83c32311cb3015ddb5dacf122d9ad751fb14f39bf3d9 SHA512 4473fad4603ce3e06f9e7ac24e1b590454e9af1cf3a9efdea100fa29e100b07ca64087fddb5c1e0674aef074501a337dec2e5e99931611be2abab19969e87db8
+DIST go-jira-1.0.23.tar.gz 115977 BLAKE2B 0b5ff8bbe2b2faeedd729daadd0646a89e5a68e26c9acf8e22750f490c7bcbd592485c2b86378036a1bb199a73a0000775b56355731d42460f8d89339b49b820 SHA512 d3fcc223c96cfc1885c7ee54e50518c6d5826b8b2231afa280b8c90c01e6413ddb0569b308ee9eae6d26bf87e59fb0913425481e6aecb78cb339f14e01194f9c
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip 1744314 BLAKE2B 2c41a3aa7252043bb516dc4933165a1f4340d1bf215c7738dc6b06c80f4fd07dfa69b4a28c19753c86270237dc81dddf216eb02e60276b37d2f09986b4256366 SHA512 f565387ef2ef70d453910177afc66dee6fdf079e03946837f92108e19d29c510de26a647ee12c70f9bbb9d04c4b86007f0d41ca774caec85e597691eb698cd0c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.zip 1278070 BLAKE2B ffb4bc459bac06ea80c224db708dfce7e3c8573eee949aa7d91317b659535d21e9130c98a4ad45619ae5d71c4cb88a1593e01aaa37a62f515187995cf0ef5feb SHA512 bd82bcc2f624c2b2e206d255cb54b4827f4015b4391ee9d69fed44cf896d7c2b81e5a2b03da21dc6d925e1738ca237613c62b650580b4b41b9844ea22cb9ec2f
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.zip 1279118 BLAKE2B afd7d6c0300d764d5e681c3f30e6eb62c05f339cdf30d7799f2efc9292eb3707375bc750b1a82b86f64ae9d9a6cc3718dc8cce1668ea1483f475ba2dd4b2a0c9 SHA512 457f46d354bf9c8ac154376a149a40282df7435786f0616f405dd6b9b364fc7cd3aadbe1dce5e3309603631ffd80d80b4c9cc7c15aa797db59dc435f05fffcf7
+DIST gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.mod 38 BLAKE2B 6092091538094feef5cb4ea7245205c239512d229fed4b84f766f9a1a97148d81885f03524b334f67cc500f43f9806b38f62e377e3c3de119eaa78f0a0fb6c75 SHA512 6a6205d757eed7f38f37ecb1187580a26a5a68bdcc822d9bc280cf4be8c02557606545e66de4dac1e799b7d4f2ecc8c88b7f1aeee8b67ef438a636b6323fff85
+DIST gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.zip 74709 BLAKE2B 64a15a1a4fd4be1e191a38bdf53c979b99ecb0531354a6da0eec4f52feda417da814a3ee75efeb36d5ed66fb1b87674728ca38bea77bc5a5d2eef614ed42971e SHA512 4dc301ecb78cd172287dc833e9f0310e2161ee07616e37f341e6b54a9b56f5fe526c9dfedd6de89220cbb397aab325db00500dfbb99c3c006e4ef71703319207
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.mod 30 BLAKE2B a733cb23b73582b4d42f33b5515fb59e4bfeb0669fdaaa0a4b8e59533425c0853696bcfaa7d5af6c042ec23987f7cb2b74c5e1e908d1657a8162f35e99fe4fea SHA512 d80e2a5ddcb2f7cdc43888ee7231f5245adef193ed75e6b778389081f8ad5f5e04ab3d06c9ed032f7afe8942ddf760e965844b507e587ef8ea42cd3a4c9e5de3
+DIST gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.zip 69259 BLAKE2B 7e91ff7c7bd37e02358e2781e5c2b9ba75886aeab5ce460782be52ea2b1a71f6e2ff042384a7f77ae65e222d10f683d75bb1f14645dfaba1ca0b0aee17cbc85c SHA512 f620146815ac039b301e6ec600dbeb39f8d70b9bd0249321937ed046b58b2f58c928712f9331423c3de721ffa8e62617b07c64b98e05fa0224d4d54660b6a0c3
+DIST gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.mod 33 BLAKE2B d94041b46488a00211804605c4c1f48fea8a2ffd46aa044a6de8e392b1aa11c4e9472e8659089a6df483454611dfcb3bbfccfb968299f39a0af9f7ddbfc35c4d SHA512 9bd27d1f9e44139ed790c5e1323c0b796655a1d5c2b68c5f04e9ccf1806951ac11e60916cf1d2af833c629ad30ca6c648c2c9ca6b05b461c3b94c6cdc1b113e9
+DIST gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.zip 45705 BLAKE2B a6ba115d31727de39dbb99db875baa4b0e673ac06ddc6da8a76d9e13eeef9b0b4e7c01071f2fcce89db992c4edec475ef698d16db633e00de2f437863ea6fc20 SHA512 6a51febebace10a89458ca6cc7607570e14351423b5b269b341e23c0069225d759668fba645f3986c735517b7120e3879719d40a901c7bd21da7abb395ceb340
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+EBUILD go-jira-1.0.20.ebuild 721 BLAKE2B c39825d841a8f98a891aa2328f9001583bbeed936d3f0b301e87e31895801c508a724db9fec8fee884c8e2dc5623d698d5597aad818b2900713322faba671a2a SHA512 4e6039b1f7f74cba027169da8e6ee2a44ad048304b53c18cb59707d171da600df8a4e74bb81d7bee818d29948073c99cb8330a6a58a30565b48ec7c8d6dd02e8
+EBUILD go-jira-1.0.22.ebuild 1918 BLAKE2B 247eb115613b5abc9c170a727d41858b978484491f8096ab911eca40c156ba0d750a3b34c14022291930681a8c8232734c42ea2a1c6a32d8ec27bb26344e15d8 SHA512 9b21a4a1e21f8512ccba1063a1b1bc0a55a628f532bc4531557b1888cf014192ac670ac91086f8409cb86ba9726b1f25d952933c34c6b8d2eaff5cba624f5892
+EBUILD go-jira-1.0.23.ebuild 5798 BLAKE2B abca764c01f5cbfdc2e02d8cf54754972b8e0e1057e4a674e5aaab53b891b53341cd5db7596a87c143ae6032cf745118ff16c73a80d0746b4fbc0e551a1228b5 SHA512 1baff5fd627d800be8a4b5b2a303eba031a9cc00f5f9bacd296ed176df5e4eb47c63f66bdd685526840c4a44a8d41cfa50f3b55b57f18fe83b5d2f4f5c5dcebc
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.17.ebuild b/app-misc/go-jira/go-jira-1.0.17.ebuild
deleted file mode 100644
index 6092975389c0..000000000000
--- a/app-misc/go-jira/go-jira-1.0.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="amd64"
-
-DESCRIPTION="A simple JIRA commandline client in Go"
-HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
-SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/jira
-	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
-}
diff --git a/app-misc/go-jira/go-jira-1.0.20.ebuild b/app-misc/go-jira/go-jira-1.0.20.ebuild
index 143386496429..c7c205f6a22c 100644
--- a/app-misc/go-jira/go-jira-1.0.20.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.20.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64"
 DESCRIPTION="A simple JIRA commandline client in Go"
 HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
 SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising"
 SLOT="0"
 IUSE=""
 
diff --git a/app-misc/go-jira/go-jira-1.0.22.ebuild b/app-misc/go-jira/go-jira-1.0.22.ebuild
index 66a48f981c1a..34bd671ea5e8 100644
--- a/app-misc/go-jira/go-jira-1.0.22.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.22.ebuild
@@ -43,7 +43,7 @@ EGO_VENDOR=(
 SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	$(go-module_vendor_uris)"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/app-misc/go-jira/go-jira-1.0.23.ebuild b/app-misc/go-jira/go-jira-1.0.23.ebuild
new file mode 100644
index 000000000000..ea958066106d
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.23.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# bash-completion-r1 can be added once we can generate completion scripts
+inherit go-module
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+
+EGO_SUM=(
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.21.0+incompatible"
+	"github.com/Masterminds/sprig v2.21.0+incompatible/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-runewidth v0.0.6"
+	"github.com/mattn/go-runewidth v0.0.6/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.3"
+	"github.com/olekukonko/tablewriter v0.0.3/go.mod"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/theckman/go-flock v0.4.0"
+	"github.com/theckman/go-flock v0.4.0/go.mod"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7/go.mod"
+	"github.com/tidwall/match v1.0.0"
+	"github.com/tidwall/match v1.0.0/go.mod"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd/go.mod"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e/go.mod"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153/go.mod"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/jira-${PV}"
+
+src_compile() {
+	go build -o jira  cmd/jira/main.go || die
+	# these cause failures.
+#	./jira --completion-script-bash > jira.bash || die
+#	./jira --completion-script-zsh > jira.zsh || die
+}
+
+src_install() {
+	dobin jira
+	dodoc {CHANGELOG,README}.md
+	# This can be uncommented once we can generate completion scripts
+#	newbashcomp jira.bash jira
+#	insinto /usr/share/zsh/site-functions
+#	newins jira.zsh _jira
+}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a9d2c0be9027..4365de15ed13 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,8 +1,3 @@
-AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
-AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
-DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.2.ebuild 1148 BLAKE2B a753b5b303d6d59ea2cb9f596367c473896328947b64214cecb53d59082292c9f38e553127142b25ca6e0f52ab379f25a52ccd95d54c258ccdbe6a831877f4ac SHA512 5192b0c80ea964422fb49e607af8e0ac68a8dced02182a38cea1c0fea5583a07784ff8ffc6f47f56c5b9f41d217717e9dab776920c1872b0b137f8c3fb07bc43
 EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
-EBUILD golly-3.3.ebuild 1028 BLAKE2B 28d361d337836b78321ee373eb8b6b08b6bfa387c1af6cf5cabddce7fee0f82960a013bf38d8d98c3c7e0c20ca98a1287024ed71357f44d3d0e7becc45420366 SHA512 7106647455ff3b6a2754ddda2c07aee65a129d7021a4e22f9c9561ca10301836967e3840b9181ddeb2bdeeaf4cb910e4ba9c2181e5f1b75bda216a60fa5398df
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.2-mouse-1.patch b/app-misc/golly/files/golly-3.2-mouse-1.patch
deleted file mode 100644
index ab4fc703f507..000000000000
--- a/app-misc/golly/files/golly-3.2-mouse-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e22d1534d486a7b46612ca6f6cd693b8fa4635d2 Mon Sep 17 00:00:00 2001
-From: Chris Rowett <rowett@yahoo.com>
-Date: Tue, 10 Jul 2018 23:22:20 +0100
-Subject: [PATCH] bugfix: do not process other mouse buttons until current
- button released
-
----
- gui-wx/wxview.cpp | 15 +++++++++++++++
- gui-wx/wxview.h   |  2 ++
- 2 files changed, 17 insertions(+)
-
---- a/gui-wx/wxview.cpp
-+++ b/gui-wx/wxview.cpp
-@@ -2801,6 +2801,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
-     int button = event.GetButton();
-     int modifiers = GetMouseModifiers(event);
-     
-+    // ignore if a mouse button is already down
-+    if (mouseisdown) return;
-+
-+    // flag that a mouse button is down
-+    mouseisdown = true;
-+    whichbuttondown = button;
-+
-     if (waitingforclick && button == wxMOUSE_BTN_LEFT) {
-         // save paste location
-         pastex = x;
-@@ -2870,6 +2877,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
- 
- void PatternView::OnMouseUp(wxMouseEvent& event)
- {
-+    // if the button released was not the first held down then ignore
-+    int button = event.GetButton();
-+    if (button != whichbuttondown) return;
-+
-+    // same button released so process
-+    mouseisdown = false;
-+
-     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
-         StopDraggingMouse();
-     } else if (mainptr->draw_pending) {
-@@ -3273,6 +3287,7 @@ PatternView::PatternView(wxWindow* parent, wxCoord x, wxCoord y, int wd, int ht,
-     selectingcells = false;    // not selecting cells
-     movingview = false;        // not moving view
-     waitingforclick = false;   // not waiting for user to click
-+    mouseisdown = false;       // mouse button is not down
-     nopattupdate = false;      // enable pattern updates
-     showcontrols = false;      // not showing translucent controls
-     oldcursor = NULL;          // for toggling cursor via shift key
---- a/gui-wx/wxview.h
-+++ b/gui-wx/wxview.h
-@@ -102,6 +102,8 @@ public:
-     bool movingview;              // moving view due to dragging mouse?
-     bool nopattupdate;            // disable pattern updates?
-     bool showcontrols;            // draw translucent controls?
-+    bool mouseisdown;             // mouse button held down?
-+    int whichbuttondown;          // which mouse button is down
-     wxRect controlsrect;          // location of translucent controls
-     wxRect pasterect;             // area to be pasted
-     wxCursor* oldcursor;          // non-NULL if shift key has toggled cursor
--- 
-2.19.2
-
diff --git a/app-misc/golly/files/golly-3.2-mouse-2.patch b/app-misc/golly/files/golly-3.2-mouse-2.patch
deleted file mode 100644
index b2655ba6212b..000000000000
--- a/app-misc/golly/files/golly-3.2-mouse-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 746f5f6f0c29867ac97516d00fdf58d3496a6687 Mon Sep 17 00:00:00 2001
-From: Chris Rowett <rowett@yahoo.com>
-Date: Wed, 11 Jul 2018 12:44:22 +0100
-Subject: [PATCH] bugfix: clear mousedown flag in mousecapturelost event
- handler
-
----
- gui-wx/wxview.cpp | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
---- a/gui-wx/wxview.cpp
-+++ b/gui-wx/wxview.cpp
-@@ -81,9 +81,7 @@ EVT_MIDDLE_DCLICK    (           PatternView::OnMouseDown)
- EVT_LEFT_UP          (           PatternView::OnMouseUp)
- EVT_RIGHT_UP         (           PatternView::OnMouseUp)
- EVT_MIDDLE_UP        (           PatternView::OnMouseUp)
--#if wxCHECK_VERSION(2, 8, 0)
- EVT_MOUSE_CAPTURE_LOST (         PatternView::OnMouseCaptureLost)
--#endif
- EVT_MOTION           (           PatternView::OnMouseMotion)
- EVT_ENTER_WINDOW     (           PatternView::OnMouseEnter)
- EVT_LEAVE_WINDOW     (           PatternView::OnMouseExit)
-@@ -2901,18 +2899,15 @@ void PatternView::OnMouseUp(wxMouseEvent& event)
- 
- // -----------------------------------------------------------------------------
- 
--#if wxCHECK_VERSION(2, 8, 0)
--
- // mouse capture can be lost on Windows before mouse-up event
- void PatternView::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
- {
-+    mouseisdown = false;
-     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
-         StopDraggingMouse();
-     }
- }
- 
--#endif
--
- // -----------------------------------------------------------------------------
- 
- void PatternView::OnMouseMotion(wxMouseEvent& event)
--- 
-2.19.2
-
diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
deleted file mode 100644
index 733fce4ccb93..000000000000
--- a/app-misc/golly/golly-3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mouse-1.patch
-	"${FILESDIR}"/${P}-mouse-2.patch
-)
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
deleted file mode 100644
index dffedc97b55a..000000000000
--- a/app-misc/golly/golly-3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 9d9d80202e82..138182bec6f5 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,3 +1,3 @@
 DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d
-EBUILD goobook-3.4.ebuild 1099 BLAKE2B 5d52a7b5482b52e988aad28298a045d12d5a540eb92465e1453a41672ebd2a0edf511ba33508796d5b0bc70ae7f25d72a50a08133454688bd5f883fc864d0a48 SHA512 984e4f409f4f2c0135e2dca5c2c82b1c89487c8d81c36e613a69927c8fac10f5a2db61eb40fedcddab5477987af65458dbb2a43289cc65814390a312b99ba0c5
+EBUILD goobook-3.4-r1.ebuild 1183 BLAKE2B acc109f025c97de20d17d2170792dcf181362afef602c432647f27cf401a846bd9e63c1762377f89df49bb4680331c9ac248a1cb88d5c56d317ce20b9359911e SHA512 47b8878e27c0022654dadcb4c7de90c40ae6b77f943c9fdf105a464a98f48e31e78b00cbb8143c83fdc5ff6971e76bce01bf3638be377c508f9368fccbaddb89
 MISC metadata.xml 453 BLAKE2B 000e304e5d8f67c8f2b272b75a3f501e5b73366e8ac75f9a1a8f5f7b4c67ef75e8a8f540f3f30b73ea85d9bf290f0676697094ecf55dc11180d84200194614af SHA512 910714efd3b83f29a6b95b5ac13a7c832ae336a6c5bc7505d6ed44a8342ad31b5b2545c63ec25be525a0cf54efb62283d576cfb11947018f75490453a0823045
diff --git a/app-misc/goobook/goobook-3.4.ebuild b/app-misc/goobook/goobook-3.4-r1.ebuild
index bb2a49f209cc..f95cf02f00e3 100644
--- a/app-misc/goobook/goobook-3.4.ebuild
+++ b/app-misc/goobook/goobook-3.4-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"
@@ -17,8 +17,10 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]"
-# dev-python/{simplejson,oauth2client} are deps for the above
+	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-5[${PYTHON_USEDEP}]"
 
 DEPEND="${PYTHON_DEPS}"
 
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 25208bee2b72..90bf4ce9b33b 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,7 +1,3 @@
-DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
-DIST gramps-5.1.1.tar.gz 17281131 BLAKE2B e729183832799a66547bb3958b4892c69359ec8e506766f4c64450f8bec3bf253460850f54388fa73659243cd96679c787fbbb9d645214682df26041c43b2c56 SHA512 fee7df5d2df2ae202c5e8ff4b941df4db6675925f6fce185c0fae709dd35ecfd6a1b81c8266d3f417f4949bed4e39f984a56917e74f56a3f3e499a4353927c37
 DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
-EBUILD gramps-5.0.1-r1.ebuild 2050 BLAKE2B 74b0a5331425c3d66228d12bc7302acf3bfd072982321fee4d2e53c70ed1bb788d9e986f2716e696bac8d64e28149620215c278160b040d1aa031081025aeaad SHA512 14ce17792d6ecef68a42ad7b2b16f261bd045822c29ea404ff5f40f6be64cfdf231a694211067a01c79c369a95bae027fcf9072fe76ee1b6468b825df57e8fe3
-EBUILD gramps-5.1.1.ebuild 2052 BLAKE2B bd0885f5764b3bfe2287f6d22c6e09a88da0f194fa5159445c7d951b2119bb1fe5a040b24c0c458fbca24d3998e154e19439949304b3e5987e7821b43b7467ba SHA512 683e11aa8de69c81ac1529e2c160243390f8472597a07ab9851c28cc68d9a03fb39d45cf4f7c7d2fda546ac1150794b42f9c35a33eb9dd5c222e4d2ffec59c69
 EBUILD gramps-5.1.2-r1.ebuild 2054 BLAKE2B c5ae8154cc93b82ba0ed477833a02444ce55b524a58bb3218757eb62cc9b9aa609a3c94e97f995dcfd0eccc538d8dd1ec822d3794b7ee956f9e9e772c4e5581e SHA512 88e0155ff411b12a89f179181450d1ab9020f8a7cf24accd95f9d5606b64dd83b3ff653367ce3d1bea38912c14bef918d04dcf8d339bfc8e9caa840e834d76ab
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.0.1-r1.ebuild b/app-misc/gramps/gramps-5.0.1-r1.ebuild
deleted file mode 100644
index e10ef31f3c22..000000000000
--- a/app-misc/gramps/gramps-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# 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.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/gramps/gramps-5.1.1.ebuild b/app-misc/gramps/gramps-5.1.1.ebuild
deleted file mode 100644
index b82dd8fcc4bf..000000000000
--- a/app-misc/gramps/gramps-5.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# 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.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
deleted file mode 100644
index e5e45635a7b6..000000000000
--- a/app-misc/hachoir-metadata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-metadata-1.3.3.tar.gz 52304 BLAKE2B 31da89c0ca95c381fef3354a56f45569ca0f69e8e14518e1e83897dccd5be8a77d8636127f3363f9b28998e39dfccf0d008af00f0c1e49257fe95012aa2c738e SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a
-EBUILD hachoir-metadata-1.3.3-r1.ebuild 1462 BLAKE2B a73ee92ce3fbf079575f92ba5373083b029baa513709b5407228f43f1930fb7cfeee8f4d6b58e8b2dcfa4cb48bfdb723895b963ddd35f19696d5617e36377ccb SHA512 c5dd6042b374a9850a7875e82b74bbe6a629b6800babd730a00a7017800b4fe80376e1e8ab7edab976b0402f77138ae45a5c5069da42548507ce2633a85d7bb7
-MISC metadata.xml 428 BLAKE2B e53b795402d41bbf42f54ec1745cfa0d238a7e185d8db0fc06fdfb5faec4d6d72c6b395003f365cd8a33750ec35b7b0c62753dcc0fc949934d5de457a6b254a2 SHA512 c76d6bc6b172d7329562c87557d9695e5629a3ceafcc126f663b5af51af7f728a6f64dd875832af4acb2057ac63d23dc71526724a61395c3e34303da4177acd7
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
deleted file mode 100644
index 2f0d75855806..000000000000
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to extract metadata using Hachoir library"
-HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gnome gtk"
-
-RDEPEND="
-	>=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]
-	>=dev-python/hachoir-parser-1.3[${PYTHON_USEDEP}]
-	gtk? ( >=dev-python/pygtk-2.0[${PYTHON_USEDEP}] )
-	gnome? ( gnome-base/nautilus gnome-extra/zenity )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	if ! use gtk; then
-		sed -i -e '/SCRIPTS/s:, "hachoir-metadata-gtk"::' setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --setuptools --disable-qt )
-}
-
-python_test() {
-	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use gnome; then
-		exeinto /usr/share/nautilus-scripts
-		doexe gnome/hachoir
-	fi
-}
-
-pkg_postinst() {
-	if use gnome; then
-		elog "To enable the nautilus script, symlink it with:"
-		elog " $ mkdir -p ~/.gnome2/nautilus-scripts"
-		elog " $ ln -s /usr/share/nautilus-scripts/hachoir ~/.gnome2/nautilus-script"
-	fi
-}
diff --git a/app-misc/hachoir-metadata/metadata.xml b/app-misc/hachoir-metadata/metadata.xml
deleted file mode 100644
index 21dca811f4cb..000000000000
--- a/app-misc/hachoir-metadata/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">tool to extract metadata from multimedia files (sound, video, archives,
-		etc.)</longdescription>
-	<upstream>
-		<remote-id type="pypi">hachoir-metadata</remote-id>
-		<remote-id type="bitbucket">haypo/hachoir</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/hachoir-urwid/Manifest b/app-misc/hachoir-urwid/Manifest
deleted file mode 100644
index cf8ba210fe5d..000000000000
--- a/app-misc/hachoir-urwid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-urwid-1.1.tar.gz 17845 BLAKE2B 09262c5faa41e15f160ba30c5813578fcc30fe9f620e287421199345f21c5d912e7d70c00e1753719d011c5cc9d788f1d70cc1bcb45df822da5c175ebb7c1fd7 SHA512 e434756903e4b3885166b825331921fe9c959247a9bf8bad324aa8e3e2b5f4ce22a1546e38df9ce9a8fcfbbb96c6e6ca4bc42e455e66eeec178d85849b1526b2
-EBUILD hachoir-urwid-1.1-r1.ebuild 799 BLAKE2B e6b8eb26b4cf1988a49040b6486f298d9932ed70fe30eaa8a95575b52f132623c5c4ad3e2600df71f918aec6e71c08f71df27e08ddc2863fd8b1be0939ca744e SHA512 c0e5ff17304f285206fa1bbe45dedb221321096180f1fbd22caae516223ed3364f8bf52e7ac6e4172e66e41483e6a5066b66e62ca0a3972618fa4b9e7cc161fc
-MISC metadata.xml 418 BLAKE2B 3be1c8cb3fcd1d9c72ba300431ba67483a5ac160ec955619678a723b06ddfe14ff53dd53ce4f3604b3ecaec54ed45b9e163bc072818e9b35aa29912787898985 SHA512 7f3f6a1d6b9239aeae423fa3b8e172283c5cac3f05b738c06a17ce699576078b18649c8fbf41f4006d3bb2de2fca9f4b751a9466710539133d314d1e64527349
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
deleted file mode 100644
index 4ccb31219c4f..000000000000
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
-HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/hachoir-core-1.2[${PYTHON_USEDEP}]
-	>=dev-python/hachoir-parser-1.0[${PYTHON_USEDEP}]
-	>=dev-python/urwid-0.9.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	mydistutilsargs=(
-		--setuptools
-	)
-}
diff --git a/app-misc/hachoir-urwid/metadata.xml b/app-misc/hachoir-urwid/metadata.xml
deleted file mode 100644
index f0e7f1dca36a..000000000000
--- a/app-misc/hachoir-urwid/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">user interface based on hachoir-parser to explore a binary file.</longdescription>
-  <upstream>
-    <remote-id type="pypi">hachoir-urwid</remote-id>
-    <remote-id type="bitbucket">haypo/hachoir</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/hilite/Manifest b/app-misc/hilite/Manifest
index de0aea7b8eed..2b7040157c2f 100644
--- a/app-misc/hilite/Manifest
+++ b/app-misc/hilite/Manifest
@@ -1,3 +1,3 @@
 DIST hilite-1.5.c 2872 BLAKE2B bd6f89863100906a731008cc3c1b0480e3aa655119d73d651f425a2686ab0a861637f5818c671d453ce26fd831251699e6eb3b59d3e5b5938e2e1cb4de19a367 SHA512 571fb962e430d3c9e5494d802f529529a5bd0bf6dd7f398e7c55dd5a8effc568f9153edecf50d2e296b97eb20b2ddaa52c2214b9dd989449aff3b93a0547ad45
-EBUILD hilite-1.5-r1.ebuild 681 BLAKE2B d848208a9e09d10a110a94d91bd53e1ae9bc860783cf384170cebd9f11463057ba89eeb42224e8c535c086b37b65cf09f8ff85d5cd67bcde95c3da8d70c74c97 SHA512 b789ffcadad98af2d6adf30c49553aea634e7d78d9d764721dc666462f6d769a2bb69b22a84228a4024b243889011545cda5078d1296cf75cdbb66cb3fff4ab2
+EBUILD hilite-1.5-r1.ebuild 682 BLAKE2B 2e9f7fb7da4ee7b6c4fe4fdb5bc360031a56313628423a821af28dcc05218bae647fa6c796182a5929b9373d644496dbbc2a9af9768b4a2e8a44521bffc8bfc3 SHA512 57472ffe8e4182c561b5f42c8b81487fce09d30b50158f5d908d9966d008e4f3c025be143dd8fb223a43fd95c314c535b060b6d9b496be9b29e57a0c7d2e812b
 MISC metadata.xml 341 BLAKE2B 95a2d672cce1e13ac46dfcc1661b556a241aafdaf9afdb2a5a84afd4ccc94bce8edcf5483f5deda7cb62a834be32be1f7a0fed38d26b96159e4477e668201df0 SHA512 792aa66d85af91677e5d075168e80f3c4d21a804047bcae76e685e612d0c57edf61167712639a5d3322d9f4c35d25b04b6ec2b8d1cd2150d396b8b4e95e8fcad
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index 0eb05fd3e23d..b8ee20d4bf43 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index fe93c97ebc7a..7011dc8f9410 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,5 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
+DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
 EBUILD hivex-1.3.14.ebuild 1849 BLAKE2B 0c138e91aba7d4bdd04680d34330123cba162564f1ccc70d8310d77de7ab87940bd3bc87f65a84a2585a194cafc821538a9674c2ec32eb45f001c7895c26d432 SHA512 0c25e80c4a57e7fdaec743ab7696149f68541468569d2f46353dc2c16e9441270108ebd5238b38cb96d25f1d74eda56b3afb0d9636200edd730b6df5f8a5d97a
+EBUILD hivex-1.3.18.ebuild 2012 BLAKE2B f09323eb98b587a7511553a20436af5c319f944fee81ebc27081635ada7b19946c47c17e36d59860947594b61d39d7a476ec8b628585a9a05752daa528109f11 SHA512 b09471c6d176fdd527d07aed7d901a73875081ad4ca8d385a165aa8e01deabb805e3a783b4f453b981d1ddbc52ec5562c5a290dadf565edc36d183c33b87bd7a
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
new file mode 100644
index 000000000000..ac1bd5848abb
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_OPTIONAL=yes
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils perl-module ruby-ng python-single-r1
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="http://libguestfs.org"
+SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocaml readline +perl python test static-libs ruby"
+
+RDEPEND="
+	virtual/libiconv
+	virtual/libintl
+	dev-libs/libxml2:2
+	ocaml? ( dev-lang/ocaml[ocamlopt]
+			 dev-ml/findlib[ocamlopt]
+			 )
+	readline? ( sys-libs/readline:0 )
+	perl? (
+		dev-lang/perl:=
+		dev-perl/IO-stringy
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	python? ( ${PYTHON_DEPS} )
+	"
+
+DEPEND="${RDEPEND}
+	perl? (
+		test? ( dev-perl/Pod-Coverage
+			dev-perl/Test-Pod-Coverage )
+		  )
+	"
+
+ruby_add_bdepend "ruby? ( dev-ruby/rake
+			virtual/rubygems
+			dev-ruby/rdoc )"
+ruby_add_rdepend "ruby? ( virtual/rubygems )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+			ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+DOCS=( README )
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	if use perl; then
+		pushd perl
+		perl-module_src_configure
+		popd
+	fi
+
+	local myeconfargs=(
+		$(use_with readline)
+		$(use_enable ocaml)
+		$(use_enable perl)
+		--enable-nls
+		--disable-ruby
+		$(use_enable python)
+		--disable-rpath
+		)
+
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	default
+	ruby-ng_src_compile
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
+	python_optimize
+
+	ruby-ng_src_install
+
+	if use perl; then
+		perl_delete_localpod
+	fi
+
+	#can't figure out a better way to do this
+	mv "${ED}"/usr/man/man3/* "${ED}/usr/share/man/man3/" || die
+	rm -r "${ED}/usr/man" || die
+}
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index e22e8b38ba80..e78c62819d5a 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -3,5 +3,5 @@ AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a451
 AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 905 BLAKE2B 7e5fc7892f9f64825fc77b5710dfd65b4884edeb4b1b83101c77060f79e99119a4e9808040477b678297d8b67a2540bd1d87db91e7f7f7292cb16662da504efe SHA512 ff6f9eedd0edb74bedc3875ffc74312bc10790baf35a03aa51487f51f600f9e4f80bf7dfb24a43cc70b766ad29680cc57962db5c0a99dce0a498261ae295418a
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 906 BLAKE2B 71780afe05775574254e3aeadd6d9c63da89fe6e998dd583ce7a1c2f6e0eca83f9d5282a3f1734aff380b666faf646e050776ada94f1140a5804c3b9b3213fa3 SHA512 6406644b5f1775a3458579e32fc56c949bdcb97a42db554f4522dfeb28a13e1cb485d07b8ba1cedb14ce6223ff8f62871c5d5114df1db3316f994fc54c08bb57
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 4e84560c2902..17e8abb7af2d 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 6bf17597c5f8..9e9ef82f2e74 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -4,8 +4,6 @@ AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf2
 AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f929f639310bd1089bf4134bf1aed722701f23b108db62057b75328e2debf1b0313cdc7eef60b116173b7e5d SHA512 ce02eeba87606a1a95b301abdb42eaad2bcd6049ebac1514cd4316f0202439142c7c6d529f34770a663f10e34190ac22dde039c36c51a1e1d5300b1dc56bd555
 AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b
-DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
-EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
 MISC metadata.xml 595 BLAKE2B cf785d8ceab62aa62f65f3f9eadf20fddab1e15f4461960e66a3b8c4fb747d6748a94576f2300ac7bef4220a635a51d90dc85d8c8eedfa097eef76c1dd9456be SHA512 ff760e992f881a3f7b252cbc59d7a97dbff503100d6ab72d2f0e5beae7ae5431bbc69fd58e3db12bb9c353826613e2c671790e04203a607a7029ca67003a42f6
diff --git a/app-misc/jq/jq-1.5-r3.ebuild b/app-misc/jq/jq-1.5-r3.ebuild
deleted file mode 100644
index b64204f809c6..000000000000
--- a/app-misc/jq/jq-1.5-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.com/jq/"
-SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs"
-
-DEPEND="
-	>=sys-devel/bison-3.0
-	sys-devel/flex
-	oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
-"
-RDEPEND="
-	!static-libs? (
-		oniguruma? ( dev-libs/oniguruma[static-libs?] )
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
-		"${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
-		"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
-	)
-
-	use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
-		configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		# don't try to rebuild docs
-		--disable-docs
-		--disable-valgrind
-		$(use_enable static-libs static)
-		$(use_with oniguruma)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	default
-
-	use static-libs || prune_libtool_files
-}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 6ed3547fd011..7f0411563fc5 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce02388a61fa1c426cc16e97fe509110c2f129203882504dd4d7bbe6ddf95a01d7147abf78a0a9b6c898af89814ee SHA512 7618e34e35726670721dfd12e1434d5ffe4221ffad5d751ef26dc26edab4334c847582bbd4f50cfb93f37a07397ccc467e240adaf3dcf1d9446e0ca6faff7721
-EBUILD khal-0.10.1-r1.ebuild 1269 BLAKE2B d5d22e6aadee22cfef00cfa95e429e9a4616c6ae735cef3b7c7bb102a14679c1a9e221cfdf4a6c65a57b1aad317d49b0d64f4e4c134232e0695e6ad9ee922587 SHA512 0adf14a347bf860b8cbbd225c7a27ea13805fed76b3f0711094e08304f22e4fa555d2107924c3f7e3fb64fa535242428d7129888488eeefcae9d2890a0d8a74c
+EBUILD khal-0.10.1-r1.ebuild 1276 BLAKE2B bd0128fd4434a44f0e0a33fe31ab7e4df0240b276577a22b6d45d1fe576f9e4e5e5f079d7853530d2cec8d70e8c24e980fd8808e2a5e4604a3bcdfcdca96e692 SHA512 9b0b1762fdc4a40432bb3a0109864126bb729909861dec92f52d9cd6871c4ae132ebddd3e824c5ddfac5f1275995659c1033baddbf56f5572961f03f50cb4a78
 EBUILD khal-0.9.10.ebuild 1216 BLAKE2B 368d898fdab658268309d486dbf00e081fb52ddcb78224b43c710526e34faec98e3ae92bdf049b240dec6207496e82ce742d3f5dcaaf284916a10fb066451be7 SHA512 9f71b2c9eb0557be1fd20fc1215bf6300a6a30ff0c7beb48fba84e66079ce3f4fda9fb8965d7ac1afb409f56d0fbbe3f154d2f5d2774014ade5370e4bc4313ed
 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 210ec0a6c51b..094279f9a340 100644
--- a/app-misc/khal/khal-0.10.1-r1.ebuild
+++ b/app-misc/khal/khal-0.10.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://lostpackets.de/khal/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index af6e0fb9f3c5..d152973e18d0 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,3 +1,5 @@
 DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
+DIST ledit-2.04.tgz 24430 BLAKE2B 782f39606e6151307c30a665cfb6e641647fe861718ae304171db07ac82c27ee5ca9503229a27857723de98c15ac350f60be8df2e4b4fe7dc475ef2271dcf591 SHA512 56fed04fa6306b5550dc6ab4f000553d5b01eddbdeccaafad51160ba9e2c12de5faab08cb8463cad2952501c73dff0e2e214f52a30a74da20f18af153206b807
 EBUILD ledit-2.03.ebuild 725 BLAKE2B 971ce023a924006eb0ffe4a06709724fe9fa29a5d0dbf7dd6de699bd470009364b13d956a57cf35a281ff997b45cb50f58dd95cc85335b52da10ea079af79497 SHA512 f82312774188f31ef06a5f3a9bb06a7b2ec93b3c89bc21e01d27c796272f1011f713254ea6a3d266521ae521fa0d1cceb6b2e38db8942d75e9d96ce6f9cf175f
+EBUILD ledit-2.04.ebuild 866 BLAKE2B 7cdedb5230ee13f934cc2aaa51c0e3eb9ed21ad238c01292e4e528e8a2499c16ddbf4509e0c3bdf9ff7da233031912ec513f725b251682c18f2fbf70a2bc4b1f SHA512 23e9e1e363a2047f40762e67320d6e72468a4ccc320480cbc963b7e9c95e64540bbde659dec99164d1564d9d549c7547460f397d8cc5ea9353722a80d3e73d8a
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-misc/ledit/ledit-2.04.ebuild b/app-misc/ledit/ledit-2.04.ebuild
new file mode 100644
index 000000000000..2236980b1f7e
--- /dev/null
+++ b/app-misc/ledit/ledit-2.04.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A line editor to be used with interactive commands"
+HOMEPAGE="http://pauillac.inria.fr/~ddr/ledit/"
+SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+RESTRICT="installsources !ocamlopt? ( strip )"
+
+DEPEND=">=dev-lang/ocaml-3.09:=[ocamlopt?]
+	dev-ml/camlp5:="
+RDEPEND="${DEPEND}"
+
+# For explanation please follow the link below.
+# https://github.com/gentoo/gentoo/pull/14865#issuecomment-605697524
+QA_FLAGS_IGNORED="/usr/bin/ledit"
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 ledit.opt
+	fi
+}
+
+src_install() {
+	if use ocamlopt; then
+		newbin ledit.opt ledit
+	else
+		newbin ledit.out ledit
+	fi
+	doman ledit.1
+	dodoc CHANGES README
+}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1a8533293f99..9eff0852328a 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -10,5 +10,4 @@ AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
 EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
-EBUILD lirc-0.10.1.ebuild 3834 BLAKE2B 3f449d519f75120f7a558fb626562e2cd178e783993a980b6e04018b05249e46a51432ece7137a721cb87e679a3535e66fce54df17a075970d9fd97d2226e319 SHA512 514a8c5a44baaf0ad87f86a06050c90da3bba5f2b2038e6e7a5a36f85e2792bf6c7546a7144a1ef418afeeae608b0fc3ff4bf3e16d7a6e418abade771e15defd
-MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
+MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
deleted file mode 100644
index ff58dab0f42e..000000000000
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	$(python_gen_cond_dep '
-		<dev-python/pyyaml-5[${PYTHON_MULTI_USEDEP}]
-	')
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
-	python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 98b33f1b6a8d..248b19f7b6db 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -16,8 +16,5 @@
     <upstream>
         <remote-id type="sourceforge">lirc</remote-id>
     </upstream>
-    <longdescription lang="en">
-        LIRC (Linux Infrared remote control) allows users to receive and send infrared signals.
-    </longdescription>
 </pkgmetadata>
 
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index f8f590eb74ac..ab0c4168dc1f 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,6 @@
 DIST livecd-tools-2.5.tar.bz2 11500 BLAKE2B ed33e82931eb36f6c2648e31cdb867e1427ae7af740204334dc851d710078b87ee52ca0c1b3b714eb05dea78e1e6ace8feec19e8e516a31f7b7623a7c96a58c0 SHA512 b358cfb4390eafa212f2f1b1e604f2b021844f03490e3f0590bd7b5aa12777b096b8db7e2109dba1be5b05f35b625547041cbc69b155c7d910aaa3ed1ddc6798
 DIST livecd-tools-2.6.tar.bz2 11555 BLAKE2B 732cb5f17c0684d778925268cf326b57c36ecde333f177b6cfd51219f1a89d2866df19b1d1a997219fa3e8358eea33c7f87fb53118d5ecfc75671f89a08ce8a6 SHA512 5bf8b293909abda87ae892b92c996a4d64830f2b2b00efed2529beb6d01d6b6aef4703db0ef26087cacc1e48f20cd0ade37f4eecfa6e2bfd90471722dc06f3b1
-EBUILD livecd-tools-2.5.ebuild 985 BLAKE2B 1a743771cd4402fd01dc3a21ca90c9fed4d9fe4b267187ca0bf3401a1988c91a824067a8557e603321c75590074455bf70bea66385e94188775aa0becd0a44b4 SHA512 268bda233c42c794f9ebfcd882aa59597ad18d63339fa0afcd7046ec0d5509b0fd935636274937656b90d3db7bf565c6ce19d6f7d836d77940031d72c3a330a5
-EBUILD livecd-tools-2.6.ebuild 986 BLAKE2B 61fd0267a51195d913eee8465e6614d022b15307dee36c995e6c1f6f7d20fbc2be8602111861d1f7c6be8f1ac47bd3953cadf1b83b6d9661c62a97e64f429125 SHA512 1bfc31d9c74b08617e5cb2bd63da909f0b0e495aaa049992615169ee563d56b0d85ce21372559fccff72d9f8dc525434037e388278a013157801db3d99916b5e
+EBUILD livecd-tools-2.5.ebuild 986 BLAKE2B f17ae7c2ce538d88e9cc26bee97130152892efeab5ccb813dc43aee929cfc0bdecff9ba42494d603b35998131b32c80053f5822bd264b8b11d4e6c8489d7b91f SHA512 d094c8d58248e1716aca7a9f9d345fe1c9d07a9436df8daae7ae7a5d02311fb19c7d202370125334472244c7bb958a656984af8f7acd26b0b3d571a29549a2fb
+EBUILD livecd-tools-2.6.ebuild 987 BLAKE2B 843abcdd9fa10ec70da43abcffefb813cfc607062eaa255c2132a40bdd33594281670aa49b23e76de68bcb5d63c3b05dbf36f8ea5b70c8457a37795ebacee8ea SHA512 15acafe46a2b583f776cf58f80b60b97d077edf37d12fa2c58fdad56b3f1ed94d0f7a6a2093604446ffd30e0b24d0bc758944dada859e843c39f4d8991ee24b6
 EBUILD livecd-tools-9999.ebuild 993 BLAKE2B 75f97f027fd7cd9a3c3de6491004c3c3db1727dd345d239e3a034a7556ac233db29c3a014bda087ba0d6336dd73a290c3d1f95d4fc5d6375c93c5ee19961749a SHA512 4f6106aaf278f49a72557895338683109ec67076c17024607087aa59a322ae076515d5bcf292de2273743da4678fe0515faa4ba3e828b8ddb15bbd16d25e95e0
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.5.ebuild b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
index 47bbde63988d..853a1f7380cb 100644
--- a/app-misc/livecd-tools/livecd-tools-2.5.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/livecd-tools/livecd-tools-2.6.ebuild b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
index 25b5bdfeff42..df1da9997a4d 100644
--- a/app-misc/livecd-tools/livecd-tools-2.6.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
index b1a96cf82571..f41c4179524f 100644
--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile 1906 BLAKE2B 9c294471555a7dbe6d4342e8af7c744731c05ab22adc2192eb94da5e166c5a94705e328ca600055e722d8610869d20246fab741ef494f6e68d987c913e8054cb SHA512 c3ebd2f737fc664b37e235a0a68f50ebe80f00dbc522566520edb9827771344d022531c50283be5eaddd26d72295faae2676ef58838dd65797c74059719d826d
 DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f733333825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596
-EBUILD lockfile-progs-0.1.17.ebuild 760 BLAKE2B 1369da0fa34669b7c4398c7cc7e0f861aea9809a340778bf43bebc92242ca524f15d0f39746b53fecbdd37a514f51375cc89c963687257a549ac9327cf8f8cea SHA512 3d1c74cf0fcd9727d8f527cde863c93f98b9c8c3d63209ef12edb0fc5991f2367cab26074b320c8e94ee6574592fff2a043fe5a2d461deb13bedeef0670ac63d
+EBUILD lockfile-progs-0.1.17.ebuild 753 BLAKE2B 605e24eab8adf5c962a6eefc83e1866be1e7266083133344e55ad03b96d00fb6de6b28bf4d57e2aa911ed56714e9687160b6a8447fe95bd99e41d9f1dbd133f3 SHA512 1de9c1259833365c5e5744a2e04675f575db7828632eb7d27049485b66c3e294c398716f9adf676c7df62b194bb127dc957d5ed256e58af62c1aedc6fe8de6c5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
index 2fb294180f22..72d14a1b5177 100644
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86"
 IUSE=""
 
 DEPEND="net-libs/liblockfile"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ae3779d04be6..511cee474bf6 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,13 +1,5 @@
-AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6
-AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
-AUX mc-4.8.23-gcc-10.patch 2634 BLAKE2B 5c79655526ffb8768600bf000585bd753a8ef966cc0ce82307efaec26afcc478d1311c141ed4447d3c85541e305929ffd5fee6f3a5dc105385f45eb7a88b1f0e SHA512 31fc37caec884b324a138987ff192bd1fc77a482011fbcf5a2109bd1ccaaa87960b423e83f39b6c7113564602f8134cf8a6004ea0923d95eaf424153a9a09ce8
-AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772684a54744e290f379e86cae4e1669499ba56229359b987d8e59a5673033bb11496898377642a246fc380e83eae5ef9 SHA512 eab959879de062301c6ebd04fbd2addb655a369c5cfc5104226f6cdeac6e55439e5769caf62387898fc6a6971fb7261f1e3090c950db47bc6c74671e65898339
-AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
-AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2687d2f7ec454f11a8e7e39a05677e2ba317bc989b26258f58596da609869b902c596e9f47346cdbf9f003189a2cbe SHA512 32edbd42eeb4de93fc472ed864cf091d55b0a4c5643aa12224f8fa6068c2037a32c348b7b1aafa7bb3bee75ddec8deb571ff16010d9182c19d4c763e9d94b220
-DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
+AUX mc-4.8.24-mc-lib-twice-4070.patch 1962 BLAKE2B db6f627507fd94443ea0fe13ebd026cd71fbf23d88d6c441d379ae15d19e509a5874bf894e88c3a91e608b34bf39f83bbfc6e4c4f7db2c46bdac80f1d8d688ee SHA512 35765acf211b9519958505e36c3aa30f87575ab904dcd59c7d0feae0afbdaaf83250f73a6e14fc4e9902dc9f4e5b216ffb4c365e1000e767759592048f48c48d
 DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
-EBUILD mc-4.8.23-r1.ebuild 2988 BLAKE2B 2bdf15061eb42b0fccae2665c897ba90c920b35f39fa894387d9f3dd1c98fd2830e9d613461203dec31e0b11bfc8c52ec06a6421bc0b9e649d854fb91f5336ef SHA512 c8294e20915ffee373bdc52f5a69b46e21c41751ad40b41bf883bc9d3304396681bc18593be9dac37344582a28736519b6ab3c58d2cc1744fca6677ebaea2c62
-EBUILD mc-4.8.23-r2.ebuild 3076 BLAKE2B 5e4913c549a67ccd042586e9bcdecdc5e6e6bf4e01e96c8ce7ce16db0bed52d41e2b468bdfe6b6a32f5e8c4040c7b94cb0859b8842acc623a1da618be784a342 SHA512 3525a814ac3605f47c83182a576d26d016b77a5fcabe03ebf7942b923b230c9b2bbc1c8b559e2a819842b71f86958a2da4dcd59c85ff85c791f6a4dbffcf4a7f
-EBUILD mc-4.8.24.ebuild 2813 BLAKE2B 3d54ce8cb639f1e90bd82572f85fd3ae390eea4d58a4769d33c58589fdce02141d755d23e32f963025576560d56cda83c38837f7fa0c59e1775f7c1712cf8d3b SHA512 69db600b74c8523fd9c6f3736271c397c2858ba6f7c3c8ab2578f73d798301ca08e5b3c8506c1263c9c1b0ffeaafbdb7e1b6b72ee214269d231653c181e377bd
-EBUILD mc-9999.ebuild 3072 BLAKE2B 48eaec7ceff05561dc1ce593fedff0127a34b1ae49d04b6cd31b495f32d0400f0353b7ff7f6da374c1b57b291634a449fbf24d1020ba49e5d1b1a7868bc4832d SHA512 13824093eabdf4a1162870895a4034c1ba1e1894eab646ee4e1f5b0cd24dafbc8c37f6329d56da23b8fc6c4b8696d7da966afb25f6f3e3c38a00ddf600ddd62d
+EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
+EBUILD mc-9999.ebuild 3068 BLAKE2B 30ec8da6226e9cacda2aa1d758160b94fe4e147b27a2fbf47e121efe9eceacc6202a9b2b3407912c6950875df15228a43708620e9d4424dafd5fddcb78cce961 SHA512 da76c190a27ad94fd8b204a9a52d8e6d4f5e6fc2d7f0352839758a81241898e6ba56b60262f13d8de8eab6b115ab3fbeb8f1bcdf48777e0e92e27be912c1c047
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
deleted file mode 100644
index be08e68b296c..000000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sun, 7 Jul 2019 14:44:10 +0300
-Subject: [PATCH 1/2] Ticket #3933: report iso9660  listing errors.
-
-Variation 1:
-
-Steps to reproduce:
-
-    * create empty .iso file (touch foo.iso)
-    * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield).
-Actual result: mc elters a file as if it would be empty valid file.
-
-Variation 2:
-Steps to reproduce:
-
-    * pick valid .iso file
-    * deinstall all helper tools that handle .sio (isoinfo, xorriso, etc.)
-    * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield)
-Actual result: mc enters a file as if it would be empty valid file
-
-Variation 2 is especially confusing for users as it does not hint them
-that they should install a tool to get it working. They just observe
-silently broken behaviour.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
-index 8c2240e8e..76273522e 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -93,6 +93,8 @@ xorriso_rm() {
- 
- # tested to comply with isoinfo 2.0's output
- test_iso () {
-+    which isoinfo 2>/dev/null || (echo "isoinfo not found" >&2;  return 1)
-+
-     CHARSET=$(locale charmap 2>/dev/null)
-     if test -z "$CHARSET"; then
-         CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p')
-@@ -119,6 +121,8 @@ test_iso () {
- }
- 
- mcisofs_list () {
-+    local lsl r
-+
-     # left as a reminder to implement compressed image support =)
-     case "$1" in
-       *.lz)  MYCAT="lzip -dc";;
-@@ -133,7 +137,11 @@ mcisofs_list () {
-       *)     MYCAT="cat";;
-     esac
- 
--    $ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON '
-+    lsl=$($ISOINFO -l -i "$1"  2>/dev/null)
-+    r=$?
-+    test $r -gt 0 && return $r
-+
-+    echo "$lsl" | @AWK@ -v SEMICOLON=$SEMICOLON '
- BEGIN {
-   dir="";
-   # Pattern to match 8 first fields.
-@@ -183,8 +191,8 @@ shift
- case "$cmd" in
-   list)
-     xorriso_list "$@" || {
--        test_iso "$@";
--        mcisofs_list "$@";
-+        test_iso "$@" || exit 1
-+        mcisofs_list "$@" || exit 1
-     }
-     exit 0
-     ;;
--- 
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
deleted file mode 100644
index 173def62eb0b..000000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sun, 7 Jul 2019 15:51:28 +0300
-Subject: [PATCH 2/2] iso9660: report errors in copyout in case of isoinfo
- usage.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
-index 76273522e..f9c6e50ef 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -222,8 +222,8 @@ case "$cmd" in
-     ;;
-   copyout)
-     xorriso_copyout "$@" || {
--        test_iso "$@";
--        mcisofs_copyout "$@";
-+        test_iso "$@" || exit 1
-+        mcisofs_copyout "$@" || exit 1
-     }
-     exit 0
-     ;;
--- 
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gcc-10.patch b/app-misc/mc/files/mc-4.8.23-gcc-10.patch
deleted file mode 100644
index b7cc3ee71a99..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gcc-10.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 093571938a6c31706f918b011335b8ab30602336 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 23 Nov 2019 17:41:58 +0300
-Subject: [PATCH] Ticket #4035: fix compile failure on OS X 10.9.
-
-Fix duplication of menu_map definition.
-
-Move menu_map definition to lib/widget/menu.c.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/widget/menu.c      | 2 +-
- lib/widget/menu.h      | 2 ++
- src/keybind-defaults.c | 3 +--
- src/keybind-defaults.h | 1 -
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/widget/menu.c b/lib/widget/menu.c
-index b7476b62b..68ae6f6ce 100644
---- a/lib/widget/menu.c
-+++ b/lib/widget/menu.c
-@@ -46,7 +46,7 @@
- 
- /*** global variables ****************************************************************************/
- 
--const global_keymap_t *menu_map;
-+const global_keymap_t *menu_map = NULL;
- 
- /*** file scope macro definitions ****************************************************************/
- 
-diff --git a/lib/widget/menu.h b/lib/widget/menu.h
-index c522a16c8..fad6fa639 100644
---- a/lib/widget/menu.h
-+++ b/lib/widget/menu.h
-@@ -39,6 +39,8 @@ typedef struct WMenuBar
- 
- /*** global variables defined in .c file *********************************************************/
- 
-+extern const global_keymap_t *menu_map;
-+
- /*** declarations of public functions ************************************************************/
- 
- menu_entry_t *menu_entry_create (const char *name, long command);
-diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c
-index 10ba341ee..0ba4840df 100644
---- a/src/keybind-defaults.c
-+++ b/src/keybind-defaults.c
-@@ -28,7 +28,7 @@
- #include <config.h>
- 
- #include "lib/global.h"
--#include "lib/widget.h"         /* dialog_map, input_map, listbox_map */
-+#include "lib/widget.h"         /* dialog_map, input_map, listbox_map, menu_map */
- 
- #include "keybind-defaults.h"
- 
-@@ -56,7 +56,6 @@ GArray *diff_keymap = NULL;
- const global_keymap_t *main_map = NULL;
- const global_keymap_t *main_x_map = NULL;
- const global_keymap_t *panel_map = NULL;
--const global_keymap_t *menu_map = NULL;
- const global_keymap_t *tree_map = NULL;
- const global_keymap_t *help_map = NULL;
- 
-diff --git a/src/keybind-defaults.h b/src/keybind-defaults.h
-index edb05c67f..6b7266589 100644
---- a/src/keybind-defaults.h
-+++ b/src/keybind-defaults.h
-@@ -35,7 +35,6 @@ extern GArray *diff_keymap;
- extern const global_keymap_t *main_map;
- extern const global_keymap_t *main_x_map;
- extern const global_keymap_t *panel_map;
--extern const global_keymap_t *menu_map;
- extern const global_keymap_t *tree_map;
- extern const global_keymap_t *help_map;
- 
--- 
-2.25.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gettext-test.patch b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
deleted file mode 100644
index 7e19cd7fa119..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-Test change counterpart.
-
---- a/tests/lib/Makefile.am
-+++ b/tests/lib/Makefile.am
-@@ -9,3 +9,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/mcconfig/Makefile.am
-+++ b/tests/lib/mcconfig/Makefile.am
-@@ -11,3 +11,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/search/Makefile.am
-+++ b/tests/lib/search/Makefile.am
-@@ -10,3 +10,3 @@ AM_CPPFLAGS = \
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la @PCRE_LIBS@
-+	$(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
- 
---- a/tests/lib/vfs/Makefile.am
-+++ b/tests/lib/vfs/Makefile.am
-@@ -14,3 +14,3 @@ EXTRA_DIST = mc.charsets
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/Makefile.in
-+++ b/tests/lib/Makefile.in
-@@ -636 +636 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -542 +542 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/search/Makefile.in
-+++ b/tests/lib/search/Makefile.in
-@@ -584,2 +584 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ \
--	$(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL) $(am__append_1)
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -641 +641 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
diff --git a/app-misc/mc/files/mc-4.8.23-gettext.patch b/app-misc/mc/files/mc-4.8.23-gettext.patch
deleted file mode 100644
index 3ad67dbe5d40..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-From 2a97524b42eeececd2ecd928a1154da1f5b7378a Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <and@gmx.li>
-Date: Fri, 1 Apr 2016 06:44:22 +0000
-Subject: [PATCH] Linking fix for non-default gettext package
-
-mc lost the linking game if gettext package pulled from outside of system paths.
-(Pulling can be done by suitable C-/CPP/LDFLAGS settings)
-
-Furthermore gettext package depends on libintl (if system lib
-don't provide needed functions) then gettext prepare INITLIBS/LIBINTL variable
-for working libintl pull in from gettext libdir.
-
-https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-
-Let respect LIBINTL variable at linking (it is empty if not needed).
-
-Failure example for Solaris 10 with non-system-default gettext package:
-
-Undefined                       first referenced
- symbol                             in file
- libintl_bind_textdomain_codeset     ./.libs/libinternal.a(args.o)
- libintl_gettext                     main.o
- libintl_textdomain                  main.o
- libintl_bindtextdomain              main.o
- libintl_ngettext                    ./.libs/libinternal.a(midnight.o)
-
-Signed-off-by: Andreas Mohr <and@gmx.li>
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -53,7 +53,8 @@ libinternal_la_LIBADD = \
- 
- mc_LDADD = \
- 	libinternal.la \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la \
-+	$(LIBINTL)
- 
- if ENABLE_VFS_SMB
- # this is a hack for linking with own samba library in simple way
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -556,7 +557,7 @@ libinternal_la_LIBADD = \
- 	viewer/libmcviewer.la \
- 	$(DIFFLIB) $(EDITLIB) $(SUBSHELLLIB)
- 
--mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(am__append_6)
-+mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_6)
- SRC_mc_conssaver = \
- 	cons.handler.c consaver/cons.saver.h
diff --git a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
deleted file mode 100644
index e72d641a5c3b..000000000000
--- a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/700708
-
-From 8411b93ff7cc955b0acf1541207977c52201bbfc Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Wed, 11 Sep 2019 09:17:18 +0300
-Subject: [PATCH] (vfs_stamp_compare): fix NULL dereference.
-
-(vfs_stamp): likewise.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/vfs/gc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/lib/vfs/gc.c
-+++ b/lib/vfs/gc.c
-@@ -127,7 +127,7 @@ vfs_stamp_compare (gconstpointer a, gconstpointer b)
-     const struct vfs_stamping *vsa = (const struct vfs_stamping *) a;
-     const struct vfs_stamping *vsb = (const struct vfs_stamping *) b;
- 
--    return (vsa->v == vsb->v && vsa->id == vsb->id) ? 0 : 1;
-+    return (vsa == NULL || vsb == NULL || (vsa->v == vsb->v && vsa->id == vsb->id)) ? 0 : 1;
- }
- 
- /* --------------------------------------------------------------------------------------------- */
-@@ -163,7 +163,7 @@ vfs_stamp (struct vfs_class *v, vfsid id)
-     gboolean ret = FALSE;
- 
-     stamp = g_slist_find_custom (stamps, &what, vfs_stamp_compare);
--    if (stamp != NULL)
-+    if (stamp != NULL && stamp->data != NULL)
-     {
-         gettimeofday (&(VFS_STAMPING (stamp->data)->time), NULL);
-         ret = TRUE;
--- 
-2.24.0
-
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
new file mode 100644
index 000000000000..8db6fdfb2ea3
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
@@ -0,0 +1,84 @@
+https://midnight-commander.org/ticket/4070
+
+From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 3 Mar 2020 09:26:12 +0000
+Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
+
+Before the change `mc.lib` was installed twice due to being
+in two `_DATA` variables:
+
+```
+dist_pkgdata_DATA = \
+        mc.lib
+
+pkgdata_DATA = \
+        $(dist_pkgdata_DATA) \
+        $(PKGDATA_OUT)
+```
+
+This causes occasional install failures when two parallel
+`/usr/bin/install` calls race in installing the file:
+
+```
+$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
+...
+ /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
+    -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
+ /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
+    -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
+...
+ /usr/bin/install: cannot create regular file
+   '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
+```
+
+After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ misc/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/misc/Makefile.am
++++ b/misc/Makefile.am
+@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
+ 	mc.lib
+ 
+ pkgdata_DATA = \
+-	$(dist_pkgdata_DATA) \
++	\
+ 	$(PKGDATA_OUT)
+ 
+ SCRIPTS_IN = \
+@@ -54,7 +53,7 @@ EXTRA_DIST = \
+ 	$(LIBFILES_SCRIPT) \
+ 	$(SCRIPTS_IN) \
+ 	$(noinst_DATA) \
+-	$(dist_pkgdata_DATA) \
++	\
+ 	$(PKGDATA_IN)
+ 
+ install-data-hook:
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
+ 	mc.lib
+ 
+ pkgdata_DATA = \
+-	$(dist_pkgdata_DATA) \
++	\
+ 	$(PKGDATA_OUT)
+ 
+ SCRIPTS_IN = \
+@@ -508,7 +509,7 @@ EXTRA_DIST = \
+ 	$(LIBFILES_SCRIPT) \
+ 	$(SCRIPTS_IN) \
+ 	$(noinst_DATA) \
+-	$(dist_pkgdata_DATA) \
++	\
+ 	$(PKGDATA_IN)
+ 
+ all: all-recursive
+-- 
+2.25.1
+
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
deleted file mode 100644
index b904bd1d2cc6..000000000000
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-3933-iso9660-1.patch
-	"${FILESDIR}"/${P}-3933-iso9660-2.patch
-	"${FILESDIR}"/${PN}-4.8.23-gettext.patch
-	"${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
-)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
deleted file mode 100644
index 8de901785a39..000000000000
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-3933-iso9660-1.patch
-	"${FILESDIR}"/${P}-3933-iso9660-2.patch
-	"${FILESDIR}"/${PN}-4.8.23-gettext.patch
-	"${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
-	"${FILESDIR}"/${PN}-4.8.23-vfs-gc-SEGV.patch
-	"${FILESDIR}"/${PN}-4.8.23-gcc-10.patch
-)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
index 2fff74e2efc5..de7e49b86895 100644
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ b/app-misc/mc/mc-4.8.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
@@ -42,6 +42,8 @@ RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
+
 pkg_pretend() {
 	if use slang && use unicode ; then
 		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 8366ea02b85e..35e12355b85a 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -15,7 +15,7 @@ MY_P=${P/_/-}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 9311ca345182..07c15bc0b6ad 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 1045 BLAKE2B e5bfb2356174d00abc99652916c54b821d3c7ca66d8227e73ca59f292118baeb0a040a8da28ec8b761a17c9d80b6774fb8e211b60f23e239917ffdbf10bf4046 SHA512 e7fd923b41e0411e1bc68f6302caebf4ab3849c7daa77f40aa017d6f87ef63cea2ea5298e11469e4c9ab3b50622089c494203e10e9a5a43f080e306ee909f21d
+EBUILD media-player-info-23.ebuild 1041 BLAKE2B 3a1852063e09a2abde60b36c507c42adae4db2129d9bf14b79eb89510156fc29450bbe40a5bbfc1b6043532d436d4b3472f5f59ebb57b58043c4288101abc0d2 SHA512 12171293c4a653e040adf57536b8e0a57ce39903735304954a6ef5733ddb4f48feeea797aecacb1b4b9e15c9aeaa826712e9495bf246f49652fd554c02be5ea2
 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 61e2ce19cd64..a55c9acc30b7 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 # https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
diff --git a/app-misc/mencal/Manifest b/app-misc/mencal/Manifest
index 8dc3057b5eba..923d1af594b6 100644
--- a/app-misc/mencal/Manifest
+++ b/app-misc/mencal/Manifest
@@ -1,3 +1,3 @@
 DIST mencal-3.0.tar.gz 19560 BLAKE2B 741628e02756cce02386f6439a015c9c1bf8801c1eaf136a761f2dc823b38d746d8e4af23e7c22ec0147f153130c11dd01912f477ffcdd75bf0141b1cdc23276 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb
-EBUILD mencal-3.0.ebuild 503 BLAKE2B 866fd5334e9ae02fd68ae9712bcf5d4f10de3781bb44cec32e6b6095081bdb2b208960c6db24069da44fa83b1a5ddb51f8a7f7ebc3b65f5e5f56b4b8a35246c5 SHA512 832a68d3566a0849711792d5bafdd066d592c6b738dd2c971aeed0921f94a83bd292a9e0f486382b7b95b59e52935df18a0bc86025ac85081d54eeeeddfee2c4
+EBUILD mencal-3.0.ebuild 504 BLAKE2B 0481a57f93fc7b1cb5447df375b4349f2332037f4a09a6d4b415f4c1c30e21b12a77930d55dea72a1eccbf409655902b8e1efac6d16535b01a0a6ed774632102 SHA512 542f96fd3aad11b57a9a4860644b636b4f307b06a9da9c0f33d9f5faf198c38e02bea704d0613c3c3b1207b87e5595c1e8b9756d344e766e0d076582e89cf1cc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mencal/mencal-3.0.ebuild b/app-misc/mencal/mencal-3.0.ebuild
index 4412ad08fbbd..3a9149fb7924 100644
--- a/app-misc/mencal/mencal-3.0.ebuild
+++ b/app-misc/mencal/mencal-3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 69b600e1db90..39bba2c18ea7 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 592 BLAKE2B e67003d8bbdbb4cda85b3580fca8c56a27243bc8b93132e5900a5860baab86ee28d41a5a27cfce5bd921c432eed8bb585a7e7e1ea5962521ce3feff5149ae8f3 SHA512 93f86afa2e76a91abb847b7fe6970b8e1df8b488f1c77c6387499ba4d55d5d392285f3e406d6b159c44176471bc6e50aa7f7370ee01d894935fd311c3b8e1d62
+EBUILD mime-types-9.ebuild 590 BLAKE2B 98c951f2b4157141b67ace94485c3da81d4fc511b9c6e4e0f704baf08e971ca87a224604f8edc9efbe75b73e06041d1379583d1a756949c13f9cd87f6ceedd28 SHA512 f71e1f0d104a77a3add30c46674c9fadcc4f031246752ca5620e22ae94d0d32908f46c579e678dc2511e5f60390935e2261c12ad5fd2d43697a06091be0da673
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index dfc9e6ef5e33..8ad5f5b7e40c 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index a05720525f1e..97b0dcfef470 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.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
+DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
-MISC metadata.xml 529 BLAKE2B 187efacd7021f27ea4f656fb0424bccdc55a84a8493ceb2c68decc308126f47005917c39c39dd151d0134fded0d30f52450a6bacb5e5f3a118813007a004099f SHA512 24bdebf455dbb65d1bc0f4c80a96ea2f49a2a30610a6524e4cec851b0e6c54fa032eaa135df47ee18f8563009514b3be617b497fd63c41de9fa51772e7f42197
+EBUILD mosquitto-1.6.9.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
+MISC metadata.xml 611 BLAKE2B be4691b67eeb17bd99ecf3783ddb5a7065f4ea89d2a4ff1a73fd572e6f720f105c7d49b91b7328e69e10b69b46e4e06147451586e3dee08f7a46bbeda3307deb SHA512 3fd1d005ee668217d3fb24c3954bdebe469f2194b332539f561fd168c8e738bc00cb858c497aa83629cc347481e9609c588ec889be260bf49c822e304bd21ff7
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 3dda59ac8d5d..029cf18b51fd 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -11,4 +11,7 @@
 		<flag name="srv">Include SRV lookup support.</flag>
 		<flag name="websockets">Support the WebSocket protocol.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">eclipse/mosquitto</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/mosquitto/mosquitto-1.6.9.ebuild b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
new file mode 100644
index 000000000000..4b5abada49c6
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
@@ -0,0 +1,114 @@
+# 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-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
+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 5e993153923a..cd23fadfab99 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,8 @@
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
+DIST neofetch-7.0.0.tar.gz 90892 BLAKE2B 7cee56b0b3dd49cfaddec99cd10594c5792a24dac54bae99af2bd5f13ac1a1f152fee917175a6ce911fc9b6eecb0e92cec287448f78ec714634c9fbff07a2e50 SHA512 84dde5b34b0defc24ac472efd4354483e0438c5bbed25f1f39cec53eeeee0a7d8f10dcace736b720f0e1dfbe55342ef3f5e866501bc62aee40a09bef90bf13b5
 EBUILD neofetch-6.0.0.ebuild 637 BLAKE2B 5e6b83694bd417aefabc73221164f785bcb11de5bfc2865512349dad6c1c423aa9fdc49c805fb70a7ffd93ba08c41c116f028682a2515bb3cbfe6ea4c20d5ef6 SHA512 c2087360b880f6013e1a6a002a32665002318f06169ff6dbeb9907f62de0b76c81cb51f490f7ccb1bff2fd85a452cf064c23cac0db98d531dff9053d363d9765
 EBUILD neofetch-6.1.0.ebuild 646 BLAKE2B 603f174c94fd590bf63b5ab99c112831924b838a6ca2be34bfc8bcc4da6d800ac5e0f683b07c9aa4d5a050f9d7adff962302e3cb712ae739d458e3c91eb45dad SHA512 901681cf1a38b097f9a3e18ba42a95068e0041cb19d77bb060cb48aa80fd89bfd914e5002974d79883b5d025dd07ec496af09c2604adf6f43ee333435766d54e
+EBUILD neofetch-7.0.0.ebuild 646 BLAKE2B 2ba2c750c698f355496e18a7c5b4828f170b9cf0bc21d1960e6180cc803cd13d45d8eaf0df30e4696bc07d56dab0644defe64096b21eb6e34db33748e49200f1 SHA512 b1f6dd5d06e4827d6502f49f0beb55de05c5358247fe66904ee2c9dc379802825092f59b64a8a66cf881dd193b5dd00acd3dfe1582a0f2c07393cd034b21a5b7
 EBUILD neofetch-9999.ebuild 646 BLAKE2B 603f174c94fd590bf63b5ab99c112831924b838a6ca2be34bfc8bcc4da6d800ac5e0f683b07c9aa4d5a050f9d7adff962302e3cb712ae739d458e3c91eb45dad SHA512 901681cf1a38b097f9a3e18ba42a95068e0041cb19d77bb060cb48aa80fd89bfd914e5002974d79883b5d025dd07ec496af09c2604adf6f43ee333435766d54e
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-7.0.0.ebuild b/app-misc/neofetch/neofetch-7.0.0.ebuild
new file mode 100644
index 000000000000..16837479730e
--- /dev/null
+++ b/app-misc/neofetch/neofetch-7.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 5faaabc45248..fdc5d8387352 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,3 @@
-DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
-EBUILD pax-utils-1.2.4-r1.ebuild 1764 BLAKE2B e67d2008503858e90a8f77ac15b6c685eb30f19b715fcc7de55ac81053b6f04de046ef76cf91ce27eb326f3b80933d0fc8f1e3476ccaea1eee085f33a53ca7b5 SHA512 7e6a9cdf23494fbc179438f5fcb91012798f30c3284946b1f087e709ae6901ba39311ddf7d413cbd7838fb734e966cea0b2e19949432468b6aef44786a9e6bfe
-EBUILD pax-utils-1.2.5.ebuild 1774 BLAKE2B 86444335343df2e8f6e9bd55261b58db5d615ea349b99b5a285a13af05f47995330cbf20d6cd039b1c9c3709bef202e6fc0ab65f3a1a54d3f21d12ecdaab74bf SHA512 f171c70c956b63b4a05a1b1aea30f416adb2c9d6693fd24a2ddb03067db28cf91669341a60836f6916008ca29876dfce9ffddd017ef32ef75535484b90b4532a
+EBUILD pax-utils-1.2.5.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
deleted file mode 100644
index 66b213c14c49..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 eutils python-single-r1 toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${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"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux ||
-		has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/pax-utils/pax-utils-1.2.5.ebuild b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
index 1918cdf76e44..00767ccb7d09 100644
--- a/app-misc/pax-utils/pax-utils-1.2.5.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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/pysmssend/Manifest b/app-misc/pysmssend/Manifest
deleted file mode 100644
index 96c8b4492b8a..000000000000
--- a/app-misc/pysmssend/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pysmssend-1.48.tar.gz 58172 BLAKE2B a1a33178505f3b9571c81ec90b2fc8c786ad988210c2d87f739d4b1c5c7df20bc1cc84e546a97c7a4b4063bbac363db93358c603994f99d216d1b6800c8d1c29 SHA512 d1d08e11bb4a5f450a98e9bf6292ce65edb61e0610e085dd79dcb80fd8ce1d15f7350797a0150eb6ddcc0116c17e3290f2790632eb7f54ab66efdcf662022088
-EBUILD pysmssend-1.48-r2.ebuild 737 BLAKE2B b093e9c364bf6f1771fd6da49f4a680828f8761e81f9db623ebb831b1e14a5b4ad2a82518e35cb6a116b57ae92d5b61b1feffd8a701e9a06572745f97a87941e SHA512 2a3709f00f7804c6b7c0609f1fdaabfd6c15da79d942542743927b355fa21b909fe3071611a2550720840d81e8a43f6ce0c4432ed5b84adcc7472a763018bf51
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pysmssend/metadata.xml b/app-misc/pysmssend/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-misc/pysmssend/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-misc/pysmssend/pysmssend-1.48-r2.ebuild b/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
deleted file mode 100644
index 9a6c08568a69..000000000000
--- a/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Application for sending sms over multiple ISPs"
-HOMEPAGE="http://pysmssend.silverarrow.org/"
-SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">dev-python/mechanize-0.1.7b[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript pysmssendcmd
-	ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym   pysmssendcmd /usr/bin/pysmssend
-	einstalldocs
-}
diff --git a/app-misc/pystopwatch/Manifest b/app-misc/pystopwatch/Manifest
deleted file mode 100644
index 7e4f7b734d8e..000000000000
--- a/app-misc/pystopwatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pystopwatch-2012.12.24.1.tar.xz 14580 BLAKE2B e9f6deabe932bb4adc658d5b5ebc0cc7f2de461a287773881c6d1f34e7f50a0b23b3b317344994a2717998fe6e611167ed0a5d380235f6b1a5e3f572964e7609 SHA512 4b3af373356eaafd14caeecb34150fef8e7099120855230dce7c0eabba68f75d497c3cc2eb733a086a02a96ae5feeca1898ba201a5f6f5597dcd32de9c80b3df
-EBUILD pystopwatch-2012.12.24.1-r1.ebuild 695 BLAKE2B bae1962a73f8ff7f97092d37444cd058eb77277c7989c8fe3878899845d23963cd61007b0590cda4c3bbf1134af0d37715a0ae123212680002e138dd798ec055 SHA512 c05e92a42dccd9712b2b8e5548a87137ab77a19cc36ca02879ebebbb95c857bcd0bbb07af5d5e5ef649b33aaca32afaaba426f2c9f4bfb0d04c827079ed1298f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pystopwatch/metadata.xml b/app-misc/pystopwatch/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-misc/pystopwatch/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
deleted file mode 100644
index 971bd6d07a00..000000000000
--- a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="clock and two countdown functions that can minimize to the tray"
-HOMEPAGE="http://xyne.archlinux.ca/projects/pystopwatch"
-SRC_URI="http://xyne.archlinux.ca/projects/${PN}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/librsvg
-	${PYTHON_DEPS}
-"
-DEPEND=""
-
-src_prepare() {
-	unpack ./man/${PN}.1.gz
-}
-
-src_install() {
-	python_doscript ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 4aa9e46a81c3..1e3be29944c8 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -6,6 +6,6 @@ DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c
 DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.17.ebuild 1920 BLAKE2B d2f1aa9a051127a1f95eef21637b3aba6f4adde6f2424f516efd425926c02627f5a4226daba8f72cfb943dd0462a6bf065025e8964ad94659dbaecae889628db SHA512 6bba7f1556677691b10d260132351970b5a115eb139d14d1757d817f143201d3be572126d5e63294d7db25856bd49a9b180eff03de812b021d91c1adc298c10e
-EBUILD realpath-1.18.ebuild 1945 BLAKE2B 6e721f5da530f526de29477622142ea5cba0bf7b3ec9f6613887ff2de9eb12ddc101aae1209d5ba1336b71ac83db6fa183bcad924bf1bacf2ef9e8b56d729a79 SHA512 62490cc44d6c749d6e541ca5696bef17185c38453e24180ab992a16f2ff7000db492ee15309593dc27394ea7ed8e14e3d9ddaa65764b6c824e5124e4921d7ca0
+EBUILD realpath-1.17.ebuild 1918 BLAKE2B 3e79be7f31a6d7987f5dc3b7ca8fc38f169527e6376bd70048ecb9c21653b627365ca0ba078cefa910b756b830d1775eed08b1cee92382094ca983443a571f15 SHA512 3880ac2faf76c0bceffcb0b1801d337e5e223f3f6bd425c1260c47cacb69c98f9b953ff9f42a37fc763fbc5cc350c6e1bc709872f49b0c770d60174668e85202
+EBUILD realpath-1.18.ebuild 1938 BLAKE2B e5d24bacb8002d2ab2f8ec759af23c920d36552a1e6b26858afd18450ac01967a0b129705a7246eabdd398b3a75101b3399ff3bcc1913224ba6baa3fe4ac53c9 SHA512 cc365ceebe8e5cc1511ddd0a3144af802010d37a5363b5a9278f61436331a3d96849de98b98df265d378c9415f869dd5ad42e25b85c2541da61f8bd41bd7d25b
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
index d156d6f274e0..b9d87aa10f63 100644
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="!sys-freebsd/freebsd-bin
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 34ce163c9a33..b697b59c3a4f 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 289106f2b906..992e98a4ee64 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,7 +1,9 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 DIST remind-03.02.00.tar.gz 365896 BLAKE2B 3ee47e5c0093c56a2ed95d41eff815ebac26523b64dc09b91ee46d66bac6b2b017d73902ffac61dd12c2088dac8d445fb41d832e22692f47e6e125162f0d436e SHA512 978ee2e6a45756e02bc2de0495d95c4b4377d9af76cb1ea5070f8e2438a451d2bf44245b93018bcbf6ea217520b7b4c8766d5eab354f9a0bc4982b25e90bd278
 DIST remind-03.03.00.tar.gz 390762 BLAKE2B efb17d51f9b71c175f8ff79d8d77cca44ddaa79c4837842673530ea130daea864bacd9139c27233a5846708b4162cdb0851ed57ccecce4b59b58d0acc79aca51 SHA512 0ddd751e42e01a841f46eb21a1392d353efa4e4d63c15b7ba6d7874becb16af537df4e41683db5b1bc3749d5e334c972f8b708b92bbe6f0a9e5bb6a80756486c
+DIST remind-03.03.01.tar.gz 395920 BLAKE2B b3b69ef624a70efff5f262b1da0fdd7fba1ea60c6a1375d95e1de6b6b317a2abcafb2298779e4d989c51665633a552fbd0580949dc017a2ed80b331991a0093d SHA512 25b99027b303150af05a3dc971addac970cf1f8086441e9967cba56f51e710bcb7e8e3a1b31bc72ab5205aaefbcf9bac46757b4efb59d07a109ff7e2c8680b94
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
 EBUILD remind-03.02.00.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
 EBUILD remind-03.03.00.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
+EBUILD remind-03.03.01.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/app-misc/remind/remind-03.03.01.ebuild b/app-misc/remind/remind-03.03.01.ebuild
new file mode 100644
index 000000000000..775c66a900a6
--- /dev/null
+++ b/app-misc/remind/remind-03.03.01.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Ridiculously functional reminder program"
+HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
+SRC_URI="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="tk"
+
+RDEPEND="
+	tk? ( dev-lang/tk dev-tcltk/tcllib )
+"
+DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
+
+src_prepare() {
+	default
+	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		ewarn "Testing fails if run as root. Skipping tests"
+	else
+		emake test
+	fi
+}
+
+src_install() {
+	default
+	dobin www/rem2html
+
+	if ! use tk ; then
+		rm \
+			"${D}"/usr/bin/cm2rem* \
+			"${D}"/usr/bin/tkremind \
+			"${D}"/usr/share/man/man1/cm2rem* \
+			"${D}"/usr/share/man/man1/tkremind* \
+			|| die
+	fi
+
+	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
+	insinto /usr/share/${PN}
+	doins -r contrib/
+}
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index 2ae2bbf8efc4..6d7e86bea996 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
-EBUILD rl-0.2.7-r1.ebuild 666 BLAKE2B cfe8238579d0a0c46cd1f6c72874a6f82e8e2df4a76d747a1d2353f8effa0e01bfbcd99d35523658b394c24bf0fac7827053a9627adeba7ea4a7c3f825f7ffb0 SHA512 7e817cf83f7d270d4d4be46c7a5affe080069b97daba97cf98b2de92ea12865dd24e7326719be9c41789ac75b4e098de4003081f741a71f7f1a1d20c7f31b3a9
+EBUILD rl-0.2.7-r1.ebuild 667 BLAKE2B 1f23d3f31c48b45bd25f7e0d4a558ecf4eb58d95b60bb35ede7c819d8aa6dcd87898f05f24db99a8ebd232c659cc19ea9fc5ff2b6d6887c3c0923aea4485422f SHA512 f0331652f2cd6729ae5dc517a70224a349e765047e0bd13e197caaadf1c3e4ce026c156b7f48218e6af484256dc562a1b587bed7600d02ccb98ac826422968b5
 MISC metadata.xml 468 BLAKE2B 4c1af622a68e3143bd38cf066917ea736fb59716aedb6d43e23579eed67d2f0180f7b3eb0565f7bd98c546e223cae59454aad21aa803c2898d6147d4fb4ec7e1 SHA512 0cffb46412913a382016065cf31b162d6043e94a4dc05f1f7b979e057717365ffd9702518330b0582218b792c8ac307184b22902c978e49b5e3de5471b1c959c
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
index 767c390d1e14..25fd63c8898b 100644
--- a/app-misc/rl/rl-0.2.7-r1.ebuild
+++ b/app-misc/rl/rl-0.2.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="amd64 ~ia64 ~mips ppc s390 sparc x86"
 IUSE="debug"
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 6d1d3be21986..004d07f43c94 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,11 +1,16 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
 DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
@@ -14,24 +19,36 @@ DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0
 DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
 DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
 DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+DIST proc-macro-error-0.4.11.crate 21395 BLAKE2B 86e5dfa563564c1afd63e9ad69bd294c138309d3b044b9832a60380a492bc072fc3fcd295f05bb97fcab15a352ec410d235f7f25270dc0ad89cc69212bfe0502 SHA512 8d6098bcb1b61bf6894feb10a447afb71f9862f83a0c00b2eee9b0443c77d9ad7e17f848d760c158f1070d3e6716e4490f1c31199800d72939749d71051681c6
+DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cdfbfb2417234a97dc12dab97195f88171b51cde7284b6117e48c2754e89a8d21f0ddaf7086d69b223748f00aa9f0cbb44438b1 SHA512 a1e23486c7f4af41b419b4c833789e0edd0506bc774e3504fff2bc5bc88c2f8799ae545b79138e6ce686f479ec703f90112589639bae861b99daef0f08496885
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
@@ -42,26 +59,38 @@ DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST rpick-0.5.0.crate 28232 BLAKE2B 878848091caa1906129d17ff601ebd41539791d2dba25b7c8e6eb8e463f9a7e2fc33d3bf37a515bad9dcb4f2fbde30c1c4f2772f9979f4d8cb1ba8a3a3f6a1b8 SHA512 c11b63081216071e74b655eaf72830ea3f154431bc12b84a23d4e2b2aa0c64ae0bb4ed7bb184b92cbe70747bac3ec28a6976a9690684821c34851a31e805b6fc
+DIST rpick-0.5.1.crate 27363 BLAKE2B 851785e82ffcaa2b4db990d3d470ddee3379e0c3c73bef16e1a10134b845a7dbbb4e0925e51e98ca5a36672a84ea37de68fce221c022febd50aca93ee13638de SHA512 79963988360871d90dfe169663198f416a75b2f0b8d8bd24b91eb21ae15b554c2d7a830607034b9a0720e48f43c8c0d2d5d515e066e47ab20af9bf44f771dc32
 DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
+DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
 DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
+DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
 DIST serde_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
 DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
 DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
+DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.16.crate 198097 BLAKE2B cd09744c44726d755d4c3518dbda6bbd36f9bf0525fb2e4a04bae745b7dbef3a9d5eebca57c210af0da1a99cceb0ffc5540b3a1c148f87ffbcb5fdbfa57f586c SHA512 5960ce6d6d32eab252b480ba7a8603d45212e0823b5c96f4147f79173674391ddca82a17d95a8ba39e58d8849ee9c50168301e4e48f97517696e3d826e58915e
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 EBUILD rpick-0.5.0.ebuild 1828 BLAKE2B c24e1c4ee0cab50b58e1d7d7b36993e888bdc3c20fca7a00ab35d48eb006ae368fb68cf25a2b0cc7ccba8da7a9c4fab888cc49595c09a7734b44a1c262e90282 SHA512 8fb1124d11afef641088dd34f3b3bfe086e4abca40556776bbb998e4047e7ee8bc2e29d9cd0d6a068d7d8a5d74da5b5b9dcbfff223e7a4469fd4f06f77c7debc
+EBUILD rpick-0.5.1.ebuild 1729 BLAKE2B 4d82cb424b81671c5e45cbc101af22e56b7396e2f6ba9649624924142ca82cbd943c5dd4d79a85eb4eed1a92d104bcce285831a7bdf8a03c657f000260649659 SHA512 096ad53a562d0299834302086910daa9b57728149a8c1076c3eb4e814c8eb785f8c1ec640429e1df020958ed50eaba6d13bfe16d00ed0a032a3be00e361d074a
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.5.1.ebuild b/app-misc/rpick/rpick-0.5.1.ebuild
new file mode 100644
index 000000000000..022dde8fb3ea
--- /dev/null
+++ b/app-misc/rpick/rpick-0.5.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.0
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+bitflags-1.2.1
+blake2b_simd-0.5.10
+cfg-if-0.1.10
+clap-2.33.0
+constant_time_eq-0.1.5
+crossbeam-utils-0.7.2
+dirs-2.0.2
+dirs-sys-0.3.4
+dtoa-0.4.5
+getrandom-0.1.14
+heck-0.3.1
+hermit-abi-0.1.8
+lazy_static-1.4.0
+libc-0.2.68
+linked-hash-map-0.5.2
+ppv-lite86-0.2.6
+proc-macro-error-0.4.11
+proc-macro-error-attr-0.4.11
+proc-macro2-1.0.9
+quote-1.0.3
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_distr-0.2.2
+rand_hc-0.2.0
+rand_pcg-0.2.1
+redox_syscall-0.1.56
+redox_users-0.3.4
+rpick-0.5.1
+rust-argon2-0.7.0
+serde-1.0.105
+serde_derive-1.0.105
+serde_yaml-0.8.11
+strsim-0.8.0
+structopt-0.3.12
+structopt-derive-0.4.5
+syn-1.0.16
+syn-mid-0.5.0
+textwrap-0.11.0
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+version_check-0.9.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="Helps you pick items from a list by various algorithms"
+HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DOCS=( CHANGELOG.md README.md )
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/rpick"
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+}
diff --git a/app-misc/rtlamr/Manifest b/app-misc/rtlamr/Manifest
index 74fe1f30b45e..75076850e35d 100644
--- a/app-misc/rtlamr/Manifest
+++ b/app-misc/rtlamr/Manifest
@@ -1,3 +1,3 @@
 DIST rtlamr-0.9.1.tar.gz 961802 BLAKE2B 164e3071871a52ab13cadf55f3ac79243625de01f054ff0777b45928f8fc2f29c9088a1935499ec9363efeef66ec07ae68e659aa82662d5198c0037bbf953cef SHA512 1219d408ca324a2bb8a3b412fa1c8c04c637560cda2d49e5b66de7c8082d01f0ccb6b3fb4db520a5bc9ef74285c74e0b160b3c7c9de6fdc05054c27f19d3bf15
-EBUILD rtlamr-0.9.1.ebuild 493 BLAKE2B 41a658fe6bd223880aeb6cff2c616471e78cc603c22c0187e5ee88d348ff01f8055d962af9ba305c6fee77ecf0858ba5c5d3a60e3c57e42ce08e8493a294e83c SHA512 12356af6d83d885135d465d0da3a858d7a5f46e7e44f90f329774a57b507f34eaeed5331057572fe78deb0b87a1a8c55264bd09a42f8f9595251ffc077619125
+EBUILD rtlamr-0.9.1.ebuild 497 BLAKE2B bb0eb7282f08da51329de3a73ca12f7cd5ff94877131c8ba43ba85632785c1c316f99b58782167b4542587e99c5ec426f42d226c3a293a973b7917f73feebf02 SHA512 a4228d778fb404cb7c2cc4e4b409aa8945e7316f2bf2424a1018114289a86e90ead64d0ea697026691a2483f37fc059e68b30bfc08c0ffb7b6fb2b0b16b3d27a
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/rtlamr/rtlamr-0.9.1.ebuild b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
index dd07e13bf52e..6c51ab8d5595 100644
--- a/app-misc/rtlamr/rtlamr-0.9.1.ebuild
+++ b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="software defined radio receiver for utility smart meters"
 HOMEPAGE="https://github.com/bemasher/rtlamr"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="AGPL-3"
+LICENSE="AGPL-3 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index ed791d994818..5495ad5ca3a3 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,13 +1,7 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
-DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
-DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
-DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.6.1.ebuild 4159 BLAKE2B d90781ff6d2ecf5091a771d8667901fb39dc1b747c278a8e1c41981de7f7ea7ddfdeeb96d5c793bc5ee1f573d5a1de4159c393314ea9bc7bd1a6480f57ee51cd SHA512 724cfb1f3ae5e355384983d21566f594853af99fda7ab5d8e357af96bcd9f886985a35df4e95a574827a457e9d04124b1b189837f8c3887e928aca2411bbc0c3
-EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
-EBUILD screen-4.7.0.ebuild 4204 BLAKE2B 8de1201b0885d0a4e83230d4b6d0d695f0c28f511e69ba926beb48f3599644ecd47416a463042bd751ad28f15049722eee7adbb2ccbc00d22684a3d5f3df335c SHA512 395d0188d6257d6531a3ea5740f2b9fb84f41a1f96e35ec32428e3cedd4f7045283c3216d54dae1c53a07851da88b41858a7d879ebb94d148e9c8820f6153028
-EBUILD screen-4.8.0.ebuild 4116 BLAKE2B 9d3d56bbd086abb59800a1689a3e28eee4a0680d0d71000394861f14c22cf190cde4cb384a081391f133c6a72ea182278db038411bf050a1b81a522889e1cb5d SHA512 dd5c6aa516fd76f79bb8cb48a2dd3d79365c5276ac77262a9e56c8e48ae924ecd96e808548a149a143a2d5535b88ff75c8789fac8cb9aaf7d65ef6b63d486199
-EBUILD screen-9999.ebuild 4213 BLAKE2B bf7a89626438437018f9422eb04fcd6a89fe1e9d03a3b441289caf37bf1542e39283339c8ff42c0732fc438a58a055875981a582e9e59b2cee3a4e1e18601b0c SHA512 51e1830220b543ced9844f3d79223f753ab9f3175583bef83e96e6b3520a71657087ebd6680b1c5d858a3d8f835b30d01eb806f80dd3ddef87dbd4cef23bc8e0
+EBUILD screen-4.8.0.ebuild 4103 BLAKE2B be337df6107c31b6beb5ab3df580998a44d493e39051527da2601f97496433d657c126cb27c308ab4dabd35cdc8c5fe85e658f938b84f1304e2d4d4e8f84fd38 SHA512 9964864286bb8112915980ab078e3697782082227d33a5d45574ccdd35053b7a6fc1371e74e417b7fa11c14699c22a73d51932e634b2e54371c88ec963845932
+EBUILD screen-9999.ebuild 4209 BLAKE2B 7fdaee94ecee0a356d6a03972a73850bd6c51ed84d026cde9c6dec877ccb6532b1a344541d279d3eae6ff0ffa09951a3d314e5e8b4c52340e6f872307c8e53d7 SHA512 7e4abfa69f830f628c883ff1b7de85b9ffac5e666595cb33e588163799a044e92c188f357433147b1ebc3b66bbfd8e924cecfd81931bd9e988692cb3c3e2070a
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
deleted file mode 100644
index ba249d7955ce..000000000000
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	default
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		> "${ED}"/etc/tmpfiles.d/screen.conf
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
deleted file mode 100644
index d7aa2d425487..000000000000
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${P}-utmp-exit.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN=screen-${PV} install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
deleted file mode 100644
index ed3b4f141d5c..000000000000
--- a/app-misc/screen/screen-4.7.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs user
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN=screen-${PV} install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild
index 84d601a1f28e..00c07832352d 100644
--- a/app-misc/screen/screen-4.8.0.ebuild
+++ b/app-misc/screen/screen-4.8.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index aa12bdddbbb4..f1d31c30f53b 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index f8bd8f527a04..e41a083cf92e 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,4 @@
 AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
 DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
-EBUILD screenie-1.30.0-r1.ebuild 505 BLAKE2B 972497bb77255c7f50ee32bb03a46ab0da65edb697e7aaea1656e7fd7b9d695c5119117e97ed3919eb19b08071c1776d8253b629e8cad85aec04665137b20a59 SHA512 99b089943330319642c2d7e7c6cfb0d6e34db79c85746dacf4e955fc90d3a6d3a6badb0b22fe48c7a688d7a9a0dbc7fc540dc640e2ff95760c095b0cd7803e95
+EBUILD screenie-1.30.0-r1.ebuild 506 BLAKE2B 3ac4262e1c11b709f1ee83f1756a547417d4b90d85bf433dd9930bbfbde8902fe461c824b38dc49071f2865a7c201e6b9399b88704e6ccb6c4df14b17960588d SHA512 7145d18683880023c92787cd6a0084a433d15f4bf76c3b84aa1ceedaeb4645f2bcb87d0c4295ba16631cf0068108683e553d1acd32c75d3315312ca5f30b3ee5
 MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
index 13d51de9d136..84d6cd85146e 100644
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://pubwww.hsz-t.ch/~mgloor/data/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 sparc x86"
 IUSE=""
 
 RDEPEND="app-misc/screen"
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index debfbc45b00f..1c265144a32a 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,16 +1,28 @@
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST cc-1.0.31.crate 42956 BLAKE2B 87e79061397a0e12ad4f3a32ab0b4bba764260c7de11eea055163538c749e8da32b95ad5efcb69ab72d210e0e7aed68c79f9ece33352b4cdacc5c1ec6d11f3cb SHA512 d6efba4c53fc8f11fdd685efb2759dbbbe53e65ae7878a61805b110c5a6028debb89a3e6d740bf7fd71055613de4fe92daaa98f34f86473c5a410ce3f17052df
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST crossbeam-0.7.3.crate 9906 BLAKE2B fcdfb2fc07670cc90e1a60f58b798ecf913cc27153123c430e6920cdbce8459837d8a2ac7436f1fa37389b3912fb3166917af812fee474b73923c8af316a5b84 SHA512 9b06c2379364827df715a1cf6a842d6d793f53082e21eb6daeea0ac03dbc2e6a7902d0cbd39dc8d81d82b02641925f4a70b443d65a413f8e497eb3a9be55a8d0
+DIST crossbeam-channel-0.4.0.crate 86869 BLAKE2B b0f75c33a1527bbcccaa1babffb08582368e33ad66c7838d5500ab9ed6875d603b901fb304920e1f8ea892171259cb762f9db361c84d4bb5d52114c3345686b2 SHA512 169808414541d16a9d2677edd6b4ee339a72e1c72ba43deb85e0c67a6d4980f7d21dac4fa10b612944c56abc0631e490a77dd29051c35a1adb2ed20f5ccb47aa
 DIST crossbeam-deque-0.2.0.crate 12638 BLAKE2B cbf76e49fee9e1274e295f0958458a6f8f6f0bc449a83011da3dfc64607a649ff6a72102b9ff7784e0ce2b33bb317e4a927eebb749bb9cf31a7ce89e5aca8f7e SHA512 22a1b839ecd4359e3c961e5ff0a044f6f2bc14b5ceec4637c57bb5d26ad04840b0dc0a07f06b494f4b7e224f2a51e3e9a79bf7f895a73179a10705481b33d8a4
+DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
 DIST crossbeam-epoch-0.3.1.crate 33093 BLAKE2B 915d28d3040232768a60956eaa3d574206ae7664a53af3a993acaa9fac0cca50af321923c3be71d2d1799b7a0d4eb617ddace861644a3c8b067ca360aacab34f SHA512 8fc0641701fdb1d22fa60a5408aff96bbc296b975e6f9644859295abe6ee4729d86ada81969a51a09a7a8518f287ba41fdb258dd0143ce8d7db5abff604b955b
+DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
 DIST crossbeam-utils-0.2.2.crate 11901 BLAKE2B d089d4d810d3c29163a9c3007c5c3a2479901c111905182df0c24b293853e37107693ee0fb50f0984bb7dae76908a66f1be402222667fe1eec31319e5c6e9979 SHA512 fc49d36efcb3a53125c1173415e27de43970c1d2f32547687e02c99001c98cb200047bd2b0072e47466515df5de9ee2104d1b83e7b4ccf03f0e3580a1d416f32
+DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling-0.8.6.crate 16146 BLAKE2B 4c7d19ecdc6fb1e19aaf48b0237fb16c06a6eb7458fcfc52d03457ca673b9b382b10fcc348da14418b4105b5498ca5bcfee4307b9d75f0a1ce70705887b5196a SHA512 c1b28f6c32e2e2bc7dc0710c0ec6f400a3065573fa9a248e069f17c4315d2594906aad9486abda32508acc9f3ae2b4014eb5119352fe37b92e2b344549e122a6
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
@@ -21,11 +33,15 @@ DIST derive_builder-0.7.1.crate 30908 BLAKE2B 5bb18cfe4af9ae479f0ce0c23e23fb4e93
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.4.1.crate 17157 BLAKE2B 56a1ff198fb5fefa1186fa829eb79ddbbaf4efef191cc56ed41950a8e32a27bf980994a41ebedb84fa6432d10d8ed83022a95a858daa8047fa5570aad66f798a SHA512 abb287b29f4c47741c7f8cccc7d96d23312f2880011a428613562de387326c76b15aef7e9449de3fa5c8f471330fe42639b9f06f7b9ceb16256fd97df764db80
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
+DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
 DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuzzy-matcher-0.2.1.crate 8135 BLAKE2B 9fa6417a90190905b0c563d2f629a77f4a711c4c87eb2600b2411c00f11b125b2fad346be02ef30fbf21c0e6d0ae068f89baf5b300ba61bf705c4a4256909687 SHA512 c177eacbbfb45bcf6f607e0d421da18eaf4c25738a26fd553574901be2e9f5b9fd877f4886b0f6d68050dbd7a04d37f73420648fa3e122f2a18e26794865b63d
 DIST fuzzy-matcher-0.3.1.crate 15837 BLAKE2B 33ce848aa3853df14c695139870046c63dae72479b2279b383bdda79428ccf961943b12ed2c76716f1fe1767b14ac35f9252afd5cfa9a41e977783f752bd1f5c SHA512 f3c29df8f0d70bdcfd8188d190f13aa72ef46ed607bd77abb6a237b40a771c256b35df6d78f1c6942c159132f9849d0fe3b8d106aa097eedab70ec2e7c2cc52e
+DIST fuzzy-matcher-0.3.4.crate 16249 BLAKE2B 2d3b059805d70eeee43d5d00031ac45e712703ee95386fc0ea34498d1d352cd4858985f80c8d6e2886e93659c338e06eacd83b0a219e8fd3d5e29bcd0a063364 SHA512 06e6b5ae153959d3bcbe3fa1211aaa7ee354bd156fa1ff257ec5b0dc6b41c67d682dc063f541655dd1dfd33f2743eedc54cf860628d7be302d1b53c2fd50c3d5
+DIST getrandom-0.1.6.crate 18529 BLAKE2B 11b9f6475686f59ac710705c2ffb3de3e248cc38c4da8c0d00e7ec938adcc4ffdb120a472d5a9416a9093f62c77a1565ef42a9614d7bfbe5a48aa460a16e4ebd SHA512 e4426a90e1a942344568c087b27a7e7f483e715947ddf25b5a2671b7844b646d09033994a810c9bc96c905d75bf0552e217cf93526a6294a73cb3ddc02540801
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
@@ -33,6 +49,7 @@ DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a71
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
+DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 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
@@ -47,17 +64,26 @@ DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79
 DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
 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 redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
+DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST skim-0.6.9.crate 85410 BLAKE2B 6b06657896f6959c4ea0882e99c4ecf29b485fdddbcc9b7313753e5557e42ccd786e107327aeed5485785cab001d0586059017492f1d3d7e4eeba443817c7312 SHA512 28619820fa564906a8b13d587a484055dc540befd509668e05d181888412c66530039c4cc2e5d9ad872b15b757e1f836d0503559b91eb77b1a9caed435b17d80
 DIST skim-0.7.0.crate 91967 BLAKE2B ea50dda7ba272d5c64a9bd9cf35903df87e25010ea25f1931da0aa0987b5bd1264a49c38078971686c4fbe9b09ef86905540736a6904b620a44ab425d3efddee SHA512 8e43dc786fc301dbec56234c65690461926c899a7b5aad3187f0a588f73b4470bc47fdd12f31e67c59d153cadc7a6b3408a1a23b4ccb220e069dfa6eddf38551
+DIST skim-0.8.1.crate 104044 BLAKE2B 0b375e667aec1998219f4dacbe2599440852e37bf321bdabdf8d6cc82ef81989cb88a9f9b3efc98c14845b945e93d08292d482212b881c181e1a9c25499c4cb0 SHA512 d07acb458b38f62e10a3379da0e79a3ae988700ed34105b3b4194918587514f375adf82b6ce0e86b0fb6dc259b33e63f40821a9dd912eede228f2bfeb0e59083
+DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST term-0.6.1.crate 37578 BLAKE2B 6ff130b12efadff7ece7858935f3fc9481da87ce0954c49cdcf7f4210a572274048292372aee7ef58efe6c00fa38242c2abd29bbd4563d00a55fb9337e038ed3 SHA512 5e684eedfe522da12914d579fddf1b04720086325ab18498e56b0cc709b0c8a022f887731a2bba9d0ddf200c756d12948835bccdff5bfb2b19af7d071051eacd
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
@@ -66,6 +92,7 @@ DIST thread_local-1.0.0.crate 12629 BLAKE2B 3ec8ed420965ccd2fe6f8b1322d83f339795
 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.9.crate 35141 BLAKE2B 0ade82741a12b9fb094d3c56cd2d5efae093663fb6f52156f18e5777ee556e7521cf98849dc03b88e46d0ceb3cc253afe218708346914960a1a9a371dfe15bec SHA512 33568432d0c38f77b6102c27a5fe2a654c6772afaa442b021e4d29c181573e4d22b323fba642f6e916eba5968733eb422ec1dd24bf3748dbc4158a53a1bc5f86
+DIST tuikit-0.3.2.crate 41529 BLAKE2B 214275063544462a41a9934c7ec8eeb28714b50a42d7ae0c4029fd9215e10b0dc32ce7fad81e2ffd39c02db2d5b7ed60c82d5862d515478369db480721df2dca SHA512 f5cf5918480430e380165fc2e656b98499e237113e65a1e523f4a69721afcfb4d6e64331963d3938e2883588a41459e23a6df4c5048d0c3ad5a5b561b400420e
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
@@ -82,4 +109,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD skim-0.6.9.ebuild 2074 BLAKE2B 25e289878b284c0f73a99b0354b1a39ab08912225d27795f8bc00a5e3743a3fa348c05b9698e329f0ac4f76d91324290add24416803e1a679b7ca3bcd3d84e97 SHA512 02a0485bb4dbd45190afefa6d1ae23f9ad8791313d3193ff80369de0e3de97904613b66c0f57231303f44a4a68a82088286548b2601be587ef64d0448a95f497
 EBUILD skim-0.7.0.ebuild 2107 BLAKE2B c85fef6c012344ee9342a80ad940551dcbbebee2e358866dcc2167c83b674ed9ddcb6abc184f508bf190bab3e4243156add8ea29ecc3fab0f3acb4f1b0753697 SHA512 ce5440a56ae875eeb13b7ae1aa161237f97c59bb6bc88f18068dd8d990561bb2ba162a128de4515692b8385b4bc42e28b1874b106deafcbfa0b3cf611854a995
+EBUILD skim-0.8.1.ebuild 2495 BLAKE2B d76f6f5ad0f57fe31c081827045618db760bfb98c7c261444aa7a6c694809817c183fef382f9510c5c6b4a6cc93a361ba254b7759f2b9eda79590002191b2db0 SHA512 d77c475840c2deea90dd456ecab9675de89c02e10e1dcd209587c02e7f51ffe6c875f7641d2c2046abfec3172ab7eab18463cc6040110a16b3cd2d8d02f961cb
 MISC metadata.xml 475 BLAKE2B 7cedec92f0fd023020c46b70a096c172b014b853265f8ff62a7623edfac33f106ecf524e18fdeb2812a9cdbda55dc6788993d816f3de7f04f863e03843cade3d SHA512 8f6fbbc3bf51c5614b3c3c7028193d01892d517bb3cc86a44e56129a9b342a62c8a30d27911c7741dddfa583ac14e20922ddb3b421824cc16c0f734cf4c1a39c
diff --git a/app-misc/skim/skim-0.8.1.ebuild b/app-misc/skim/skim-0.8.1.ebuild
new file mode 100644
index 000000000000..92f49bfe4fbe
--- /dev/null
+++ b/app-misc/skim/skim-0.8.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2017-2020 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
+arrayref-0.3.6
+arrayvec-0.4.10
+arrayvec-0.5.1
+atty-0.2.11
+autocfg-0.1.7
+base64-0.11.0
+bitflags-1.0.4
+blake2b_simd-0.5.10
+cc-1.0.31
+cfg-if-0.1.7
+chrono-0.4.6
+clap-2.32.0
+constant_time_eq-0.1.5
+crossbeam-0.7.3
+crossbeam-channel-0.4.0
+crossbeam-deque-0.2.0
+crossbeam-deque-0.7.2
+crossbeam-epoch-0.3.1
+crossbeam-epoch-0.8.0
+crossbeam-queue-0.2.1
+crossbeam-utils-0.2.2
+crossbeam-utils-0.7.0
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derive_builder-0.9.0
+derive_builder_core-0.9.0
+dirs-2.0.2
+dirs-sys-0.3.4
+either-1.5.1
+env_logger-0.6.1
+fnv-1.0.6
+fuzzy-matcher-0.3.4
+getrandom-0.1.6
+humantime-1.2.0
+ident_case-1.0.1
+lazy_static-1.3.0
+libc-0.2.58
+log-0.4.6
+memchr-2.2.0
+memoffset-0.2.1
+memoffset-0.5.3
+nix-0.14.0
+nodrop-0.1.13
+num-integer-0.1.39
+num-traits-0.2.6
+num_cpus-1.10.0
+proc-macro2-1.0.6
+quick-error-1.2.2
+quote-1.0.2
+rayon-1.0.3
+rayon-core-1.4.1
+redox_syscall-0.1.51
+redox_termios-0.1.1
+redox_users-0.3.4
+regex-1.1.6
+regex-syntax-0.6.6
+rust-argon2-0.7.0
+rustc_version-0.2.3
+scopeguard-0.3.3
+scopeguard-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+shlex-0.1.1
+skim-0.8.1
+spin-0.5.2
+strsim-0.7.0
+strsim-0.9.3
+syn-1.0.11
+term-0.6.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+thread_local-1.0.0
+time-0.1.42
+timer-0.2.0
+tuikit-0.3.2
+ucd-util-0.1.3
+unicode-width-0.1.5
+unicode-xid-0.2.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="Apache-2.0 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~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
+	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/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
deleted file mode 100644
index 125d0ea55fe7..000000000000
--- a/app-misc/sleepyhead/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX common_gui.patch 246 BLAKE2B f4b6c9889322f709a19673529d61d8719a55c692d9aeeb2a174ae86134fffc2216a77002ddd1544326e97ad8c0685c8311ad81fe660b22120c47718275b3be29 SHA512 952027395ac82fa3960c5efe9b98acf4a2232380a59fd9d71112ea57d26c94fc9f497e9c1c6e6fd48820f3042b16cc88d9f8b95285e857f1b5580a7e00acf442
-DIST sleepyhead-1.0.0_beta2.tar.bz2 3404013 BLAKE2B a5cf9fcb6a1c91786fffd2cbb2505ebc9608d83f5b6fc4e39fcf74def369a6fd1a40e23bf164c840956a9fe2f2c25ccf7313a95098eb6829632971a6a924ff61 SHA512 147a853bd77e6277b70d5d70f9b82f46c3f6328283c30b38d77e698146519367c9fa02f8fb21c687237657ceb78d7bc9ee07e4e8ccdbe41652ddd8dc55049eca
-EBUILD sleepyhead-1.0.0_beta2.ebuild 1156 BLAKE2B 62e8efbf1bf82e19df4974ba62044852ff3a84e23e79d382fe9ed229678f59facae66a2c3fd6d3f6211995e269d901ebd84f8893efe9d92ee63b81301b4cb4a0 SHA512 4481a5f26dc7f22e7ff34a05e35a32a07cedba753e8e532d0967ad52f35c2eb1c1ac4d5f97e8fe5a36a22204769fe7dd2e96c55f40f79b5f9c4c919e95b86637
-MISC metadata.xml 409 BLAKE2B 1777997bf87537da1a8337390065482b53fc2acae84137ebbc54fd13b221b8fc9c48a799ac9efcc6e4853f3610bab85a44679b5780fabaa0b46e1c5e20cedab9 SHA512 bd3522a2a682e51f61f5c38db6003365e06226a2015fe2aa81ed638852a663084da4d4d39962abb36aacc37462d84b706e4b35023e265635904a4d1874044ae8
diff --git a/app-misc/sleepyhead/files/common_gui.patch b/app-misc/sleepyhead/files/common_gui.patch
deleted file mode 100644
index 6e41e0ac4ce9..000000000000
--- a/app-misc/sleepyhead/files/common_gui.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/common_gui.cpp b/common_gui.cpp
-index 0f38ce8..36b0b9e 100644
---- a/common_gui.cpp
-+++ b/common_gui.cpp
-@@ -6,6 +6,7 @@
- 
- #include "common_gui.h"
- #include "qglobal.h"
-+#include <unistd.h>
- 
- #ifdef Q_WS_WIN32
- #include "windows.h"
diff --git a/app-misc/sleepyhead/metadata.xml b/app-misc/sleepyhead/metadata.xml
deleted file mode 100644
index cabb7c423f61..000000000000
--- a/app-misc/sleepyhead/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-	</maintainer>
-	<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
-	<upstream>
-		<remote-id type="github">rich0/rich0-sleepyhead</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
deleted file mode 100644
index dfebd75552c2..000000000000
--- a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-DESCRIPTION="Software used to analyze data from CPAP machines"
-HOMEPAGE="https://sleepyhead.jedimark.net/"
-
-# Point to any required sources; these will be automatically downloaded by
-# Portage.
-SRC_URI="https://gitlab.com/sleepyhead/sleepyhead-code/repository/archive.tar.bz2?ref=1.0.0-beta-2 -> ${P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="virtual/opengl
-		x11-libs/libX11
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtserialport:5
-		virtual/glu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-	eapply_user
-	rm configure
-	cd "${S}/3rdparty/quazip/"
-#	epatch "${FILESDIR}/common_gui.patch"
-
-	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
-	   quazip/zip.c quazip/zip.h
-	cd "${S}"
-	eqmake5 SleepyHeadQT.pro
-}
-
-src_install() {
-	cd "${S}/sleepyhead"
-	dobin SleepyHead
-	dodoc ../README
-	dodoc docs/*
-}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index c182030a54d0..201272cc6b08 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,9 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
+DIST solaar-1.0.2-rc1.tar.gz 1219777 BLAKE2B aa6780aa4748de97c69c03263e731a47068844e7f4275f87eadd3251e8dcf14b82fdd5ba0eae13492634b7d252340a01b9492cc8948f78fb86c15b4bc4698789 SHA512 1aa5a066c8b735e6525da4da738e9632107867e3d70d67fe7e643debdc9dc7969b033d618ff2c3f538095a9995a7e90d068f9d0f41e858361327c75718dbdb12
 EBUILD solaar-0.9.2-r3.ebuild 1327 BLAKE2B 69eae627bf9da5d7433aed7067f7f861fc7a55a31deade07b46becf5d0e30a051760a6860d203f5e16656b1d5936aec28944d59bf16f9dcb5b75c3294879467f SHA512 dc4321bfa257831caaf1d07d07af93907a3157b40dfd404056f01ff3b3071b10ace13d8d14c958f864dec11d62d86670c1bb019d39a8503b2e64f1dd5340dfc3
 EBUILD solaar-1.0.1-r1.ebuild 1120 BLAKE2B 8a22d0162004e2661426dea055b69bda82f0848aa9aaf5f3a2de1ec0b4af32d01b0fa5108730f4fed66717ec590bd5712fc7666a04610f8a5fc96291d30ed412 SHA512 a8413ffcd2d4a8348c047fff7b26f1bc3c200c2c6f2648b08195a513acac878fe27e3569f9a970ee38510dbcaba46ede35fec7e55771dc01b20522a99b3efa25
 EBUILD solaar-1.0.1.ebuild 1091 BLAKE2B c289b723169ef89d28da5e7ba08fc0b3db95b85185e802ecede1a9ee8a31e0158b4599e470482c486e19edf896a077b1cee1b642e8d46c18038c649e3b982984 SHA512 33cf43aadc08e64b96eed3599ff81a4a67593421b90d98ab510514475c597bb08043c3b0fcd68a99e1c15bddba9cabbd5152080211ee7e29bea6769ccf99e58f
-MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
+EBUILD solaar-1.0.2_rc1.ebuild 1146 BLAKE2B 38f7354bde1165b0a6d4e468042c1a0838576b4903b732191f229a80bb444408254ad5e3cf94ac4fa553dffae5a98e9c58ae0d34bde462ec9c1f09d348f04dcb SHA512 a561708aa11f7a564c2e8d330a6d66bd101362ad65a0e2dab752dc2d3d572e4fd5bf348e7b58104a7ed34a377790ad34efab54d3b9cb1d957f7835730399a1ec
+EBUILD solaar-9999.ebuild 1284 BLAKE2B 516fe9ad4b43027e0e7c8cbe2eb93cc4beaec67cd973e82ef71d11fa34d188c12eea5e568ae8a469bd31b7211d3ba2e8407d8f6fa38acace4ad9032588e968a6 SHA512 0f59c7ea6fd2c63d65e68d712f0e78dfd741942bdb36e8b00a32b7e8c1486ed2fb93504429e80552544b37461baf3e3b79d84c476bd7f3f78563709de7570433
+MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/metadata.xml b/app-misc/solaar/metadata.xml
index 69c1bb3e2d40..e43b075cd181 100644
--- a/app-misc/solaar/metadata.xml
+++ b/app-misc/solaar/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
   <upstream>
     <remote-id type="github">pwr/Solaar</remote-id>
   </upstream>
diff --git a/app-misc/solaar/solaar-1.0.2_rc1.ebuild b/app-misc/solaar/solaar-1.0.2_rc1.ebuild
new file mode 100644
index 000000000000..d4a89545dd84
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.2_rc1.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=( 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/_rc/-rc}.tar.gz -> ${P/_rc/-rc}.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/_rc/-rc}
+
+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-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
new file mode 100644
index 000000000000..6b0376ffc089
--- /dev/null
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( 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/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV} # hopefully upstream fixes this in future packaging
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	acct-group/plugdev
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+
+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/sphinx/Manifest b/app-misc/sphinx/Manifest
index 0cf8668b8436..c15d0d4afabe 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,8 +1,6 @@
 AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
-DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.1.9.ebuild 2276 BLAKE2B 23dadec2287d6daa353ff4de49e92cfe08f74f221c09a2c566c16d300eb55e64919eed03036e40f1710438fcc5fca32650c7a7604c0a354dde3fd451cb8f764b SHA512 3f19e5176e557a0b6ab8f58e4bd6c1b9415cf709dfbc138d901c1f9133c2430f02a41ae5f8fbe47ab7375a244e9277952d910e396d01ec52549dbadeb10dedae
 EBUILD sphinx-2.2.11-r1.ebuild 2649 BLAKE2B 716a99dcb60197e6ecab580859584193e316188cd7506c082e13e7d426b9b91faf1473ff17f76bccb1df0a52d31dc728d1c3dd0f478bdedf264ff52a9c7406c0 SHA512 4668953ca23357159cb06bc37fa16faf964c9384836b1662483decd0f6c44d4638c03f72ed0d3f0a9a9d7f5dde85a74eb55061d91997f4148f3e6c25808f89b8
 EBUILD sphinx-2.2.11-r2.ebuild 2716 BLAKE2B ba78dcc03cdb71dbe8bb5d8e1dc7ce08cf6bd54a34b50882176e99c1d0196e1da2a1eafd108005cb7a7f50c8a41473bc3858c84b061d1ee1cf5e80de0073c2a5 SHA512 cfce0dd3e4ce121f7f8aa37d1b5070dab63d6a6cf42b30dd9c8a7e3b9ca1c1ec6d79770ebfe58c002cfdba3e4f27269e0b5526e89c55600db9c4ac242df5bac9
 EBUILD sphinx-2.2.11.ebuild 2279 BLAKE2B 601dcbe740021c053557f2d0716160f62cf48c0e1e851762b1f8ca67a044b04a7c57183ca749edeb060bca2cec7e8473f2488a0c2e2a5cc22f54a214069dd40b SHA512 63c115cc1468c29bd3509ef7ec607c36cdc182be53a3744118c31652e4b029a07fc2d6c7b0ac5f251fc6992a01141ee67a39fce42d6795144e6c360f5bc5c54d
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
deleted file mode 100644
index 843e49c094ee..000000000000
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.15
-
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	odbc? ( dev-db/unixODBC )
-	stemmer? ( dev-libs/snowball-stemmer )
-	xml? ( dev-libs/expat )
-	virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	# We patch configure directly since otherwise we need to run
-	# eautoreconf twice and that causes problems, bug 425380
-	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
-
-	# Fix QA compilation warnings.
-	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
-
-	pushd api/libsphinxclient || die
-	eautoreconf
-	popd || die
-}
-
-src_configure() {
-	# fix libiconv detection
-	use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer) \
-		$(use_with syslog syslog) \
-		$(use_with xml libexpat )
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -C api/libsphinxclient install
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test
-	fi
-}
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index a237bc90a1ef..8f12bf5bbd06 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -1,5 +1,5 @@
 AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef60c5c5d1169cbf0d6e142db79b81c9e1faf4f374866ddc0f7201846c3eba4a99ef316eac5c5371f86d106 SHA512 032092bdd9c99917a7a446f4dc66f3fd4d91329eee9992d3026525c969d6a01420eb9131bf51bb92afe79bf2e194ad9ac039e16ac168686b7e534591cfe90307
 DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
 DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
-EBUILD splitvt-1.6.6-r3.ebuild 1112 BLAKE2B 085ed6bf9488adf9350d7f0c39eee39104c97380d88fc334c543aed1687d70e1d2a6689f8c518b375a0b77cf7db833fe897e80b70650e177cdcbe623ce46e555 SHA512 8ba3c0d8b963977b0aa70d37540223f2a85bdada5181b438970f87cc422bdb1c7357611c07768cb0e815e0db40115de05b7d5b0ace6e9cb73a89cae4802c1e8d
+EBUILD splitvt-1.6.6-r3.ebuild 1113 BLAKE2B 73a0ce2f017283f0bb780ffc1fd01d4258dbc4284d42179b73fc714fe5e4229c28b776877b8798da8e4e78819e70862a5ca055cbef36d00d7087128d97396314 SHA512 e606f052cb7182998e4aad7a3fbb594017839c33f5757c6686b54faff2297783be38d6fe7ac002f48bae84d388f34b9316ded90b9adcbe8352cb655bb695d5e5
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
index 989507ca2951..36a898023ec5 100644
--- a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index 32b1d3763668..160e5bdaade5 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,3 +1,3 @@
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
-EBUILD symlinks-1.4-r3.ebuild 828 BLAKE2B adfb367da031a7c74017d6660145e2c3a9c589510cedf031f2f7bdfa4b0ef5dfb8f9c1f8727db0e28768c4170e4a827e4a5f54682b01144dcb96e6320cdd6e41 SHA512 2897afe9d2ac0c594c9acb58402f9926941492763b43a026434310bf4a7d83165d1de554614a2f70b0142e9d4ea87c3488ed171b60696678af3e801912106d4c
+EBUILD symlinks-1.4-r3.ebuild 829 BLAKE2B 2957c2af80c0a506a8a61108f22be61c3959e068beea0bad18724ebf89168aa3a5dc5b9ca3d016fbea24527b59cfe92571c07b480895f5a25799b176c4ac6b85 SHA512 721f27b410de9bb7ba8c9f1ff8dd82b22c6f1ffc89c0df54d43d8675d11b10e1c28948154f8d10315982540af25f85b4e8629a67d7ba9b3988e755800cb6fd1d
 MISC metadata.xml 631 BLAKE2B 426a6a4bb3909963d06f6e33a29a5944dc436f9951d77ba4e63f322b70d74243f317f3fd4fdfe35ee0d767f16448473177b2fa22edb8746f35786bfc988ff217 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index afd1906a5c9c..b755b9ef5d5b 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
deleted file mode 100644
index 9840b8f9a38d..000000000000
--- a/app-misc/tails-installer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909a360371c8da0cf0bc34c78c5425a9e64af4582ec0b3de5b2a5328cb3d4248f999ddc662ce8370bec6377c4bc SHA512 9c51d36b6b97e7fd52aaacc8bae9b6dc16785c249eddc01cfa1ba3bd76b5badfd1b60e53c8735d6d206753e19d7ac48e7405d2bf69300c08391b94a0ca173dc0
-AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
-DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
-EBUILD tails-installer-4.4.11-r1.ebuild 1241 BLAKE2B 05eba22612e6a95b77f2730ccf12c486263dad7659ebdc82533a084e9bc8e90678f14a3e75c4e7fe9aaf410aa67c61d866abe65ba9c911253281362bdbd1d356 SHA512 48bf513dbb655d05bd873b3aad028323358e00dcf02a637793b3c7180b4cccefe090ae9c0c0b822e26572a0f772ff0bd3dc7771c93d240d4b9d2a0aebdab3972
-MISC metadata.xml 309 BLAKE2B af6f3c6aa04dd9f3f9b808ecc90fab80f06e47641fd56b78305edeb1feb5efc50c874007ddba4ba3d414cd9993719f844d22aac97f04c41020890d4b5e6b8e25 SHA512 6e72318e11edc847698cc3b37002b61b70b62e6f8aa644fa400c55801613ec30187b6073cc9b5218911ba4e6e08603dc77d9f3585d28acf683c732dbda2b816b
diff --git a/app-misc/tails-installer/files/fix-desktop-file.patch b/app-misc/tails-installer/files/fix-desktop-file.patch
deleted file mode 100644
index ef6b5880d445..000000000000
--- a/app-misc/tails-installer/files/fix-desktop-file.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/data/tails-installer-launcher.desktop b/data/tails-installer-launcher.desktop
-index b8a3f81..c7c5b2a 100644
---- a/data/tails-installer-launcher.desktop
-+++ b/data/tails-installer-launcher.desktop
-@@ -6,8 +6,8 @@ Name[sv]=Tails installerare
- Comment=Install, clone, upgrade Tails
- Comment[fr]=Installer, cloner, mettre à jour Tails
- Comment[sv]=Installera, klona, uppgradera Tails
--Icon=tails-installer.svg
-+Icon=tails-installer
- Exec=tails-installer-launcher
- Terminal=false
--Categories=System;Tails;
-+Categories=System;
- Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
-diff --git a/data/tails-installer.desktop b/data/tails-installer.desktop
-index 7d7fd2c..a79b57a 100644
---- a/data/tails-installer.desktop
-+++ b/data/tails-installer.desktop
-@@ -2,7 +2,7 @@
- Type=Application
- Name=Tails Installer
- Comment=Write operating system images to a USB device
--Icon=tails-installer.svg
-+Icon=tails-installer
- Exec=tails-installer
- Terminal=false
- Categories=System;
diff --git a/app-misc/tails-installer/files/sgdisk.patch b/app-misc/tails-installer/files/sgdisk.patch
deleted file mode 100644
index 21339b23ae6c..000000000000
--- a/app-misc/tails-installer/files/sgdisk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /tails_installer/creator.py
-+++ /tails_installer/creator.py
-@@ -220,7 +220,7 @@
-         raise NotImplementedError
- 
-     def update_system_partition_properties(self):
--        cmd = (  [ '/sbin/sgdisk' ]
-+        cmd = (  [ '/usr/sbin/sgdisk' ]
-                + [ '--typecode=1:%s' % ESP_GUID ]
-                + [ self.drive['parent'] ])
-         self.popen(cmd, shell=False)
-@@ -235,7 +235,7 @@
-         if not device:
-             device = self.drive['device']
- 
--        proc = self.popen(['/sbin/sgdisk', '--print', device], shell=False, passive=True)
-+        proc = self.popen(['/usr/sbin/sgdisk', '--print', device], shell=False, passive=True)
-         if proc.returncode:
-             return False
-         return True
-@@ -249,7 +249,7 @@
-         # understand... while we want to make it do this reset
-         # precisely to fix that unreadable partition table issue.
-         # Chicken'n'egg, right.
--        self.popen(['/sbin/sgdisk', '--zap-all', device],
-+        self.popen(['/usr/sbin/sgdisk', '--zap-all', device],
-                    shell=False, passive=True)
- 
-     def switch_drive_to_system_partition(self):
diff --git a/app-misc/tails-installer/metadata.xml b/app-misc/tails-installer/metadata.xml
deleted file mode 100644
index 3d969f378b50..000000000000
--- a/app-misc/tails-installer/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 -->
-  <longdescription>
-  Tails Installer is a graphical tool to install or upgrade Tails on a USB stick from an ISO image.
-  </longdescription>
-</pkgmetadata>
diff --git a/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild b/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
deleted file mode 100644
index 241bab952e7e..000000000000
--- a/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
-SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/python-distutils-extra[${PYTHON_MULTI_USEDEP}]
-	')"
-RDEPEND="${PYTHON_DEPS}
-	app-arch/p7zip
-	dev-libs/glib:2
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		dev-python/urlgrabber[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-apps/gptfdisk
-	sys-auth/polkit
-	sys-boot/syslinux
-	sys-fs/dosfstools
-	sys-fs/mtools
-	sys-fs/udisks:2[introspection]
-	virtual/cdrtools
-	x11-libs/gtk+:3[introspection]"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 54caba7ddf5e..26626d08fe7f 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -2,5 +2,5 @@ AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683f
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
-EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 00b77fe96033a3d5afed069c02e6ffcbdee4aefbc1111a908a96c43df6d575f92c155c6bd4aca375cdca170cb57ed0bbe76fc9be408c82148d4ddb0bf1e2bb2b SHA512 b952f8f2c744c1f559cea8390d88a7a5e2d67f9f41ff9ffdff6260c7a5ff577dbb2bb8fc82621cc1d28d000ed7820120ac1619374f49a5272358565fba2dea9b
+EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 3a9a2806a72816b007deddf1b37c4330eeeb82619185fec145bd1fde5b88f56e03e8ed9ef96dd1a7f664763162e309a58f95eb3730d72ba980067786975c3218 SHA512 a7b58dfac3ba0ad33291cf1e04ee7c042cd0ba6184ab64fe26db8941247ef1f1e2d778b732089a7eda31ecbe1dedb353bddea2e6c5268dc6adb8d3e53508804d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index d72bf18bae3b..a624e018c08c 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-debugging.patch \
 		"${FILESDIR}"/${P}-format-security.patch
 
-	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+	sed -i -e "s|-O2|${CFLAGS} ${LDFLAGS}|" \
 		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
 }
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index e1cc14bc6332..5f38451e3289 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -2,7 +2,7 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.9a.ebuild 2303 BLAKE2B 96e2d58bf5efed8525ef6bd24c45911af7c7821569d9931b89d3eb631254212f7fa05840cf36d0cbd494c0750a42f3f40a0aea22d81a520f5a75fbc42e8f7a50 SHA512 3ceacf201681ec27d1376c680ebc918f9853c380a135baeb366b86e280bc2e7d01a33893f5905aacd174a2be55633fbccafc0a67f1aa85207d6695f2be4b8aca
-EBUILD tmux-3.0a.ebuild 2322 BLAKE2B fefc176ff96de70ed1028c57b2fe03e43e76f8f36c0cf550dc2eeb127edc02de5ef3912f36ef28fdcf17ebd8ed01ed76e731cb45ee0e8c83be6728f826a45ef4 SHA512 237abb059a62382d5f1c6feb7eb30dcd4661a8960750c96c7506b4616053b7e9b79336633a3b30c88f456a5b1edd3ff67b8bbf923c6cc2e98d9f4293ad769240
-EBUILD tmux-9999.ebuild 2331 BLAKE2B e5ecd802cbbb6f878f92d93124c5b2a7bcfe3dbaec745c00b443a190152fe312f94ee1a68b9ba651b323ffb96a8ac4fda6427db2838812017c4d2e7c8c12ca89 SHA512 272452b6892f33474b06f0f1af6fc5a95870cb9c220724f51c7d3ecbb5e27b5aea235e97763c5c4c53407a2825ed65c1530cc807fb3d568fdc4fba2095c8e9aa
+EBUILD tmux-2.9a.ebuild 2300 BLAKE2B 5d753fcb742bc73cf2aa43fa3baee480edd0ce7ce450f03e6cc94c90c887472afa82e04a6885788cf5174372838e6a09e45a7434700b4adc0de102a159d26abb SHA512 170c4737306f8296ef0a66176159b32888e154ad6717e701f309fb31d895154cdf69f3128b199aff78535f022133ba4ade59a5c8194a1c7233fd52f9d52561a3
+EBUILD tmux-3.0a.ebuild 2318 BLAKE2B 08b667153881d780a012b20835340c00720348a1961ba83d396a2b91504e865d27de7cb740f40b16d8c182720c073f39b5fdbeec6cf8111c73aea586bb47eb90 SHA512 f6300ca1171f116e1e4c44a5779528b289fa1b510bf723740ca6da1bb0cfb7e5e1fc293f5d4c7c492435e64b448101bca2221b31663c99a83c39b78a14995a54
+EBUILD tmux-9999.ebuild 2327 BLAKE2B c4bcb63981638dfc026f8058eb94d5c0aed5ca21a3987ed7f1daeadcd3d1dd9250ad22efe438bf93042931de80c6f2a989d7ebd9880716b961f03ded44e02c61 SHA512 0bc8ec9cd27f70235e9f362282d923458734b25546ce2aa494c2a979d626642b8b0be2df8a739e3a1c61988b1379afe070b16e376d9618d41b4feb308b3b3dcf
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index d311f73111bb..ec46f9d71b89 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
index 2d07251c2cd0..4c2b37a6aab4 100644
--- a/app-misc/tmux/tmux-3.0a.ebuild
+++ b/app-misc/tmux/tmux-3.0a.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
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 350d8121d213..9b59adfc622f 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-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
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 233c8e9855ba..057b1dcbe798 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,4 +1,7 @@
 AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
+AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a005a09816aa6658ec781b1a3a76721ff8f4d573a2ae1208fe27ae136c48747dde70d9ce2c375357c4117e0a2303dab1c648d565 SHA512 804ba00f3c3bf494c853778ad388583adc40b613c35dbe63ffc63a75660df5a12e0806ac2f3d352cb4818c2cb53ff4d49d519924d231f98ebce4af1dbb5085e5
 DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
+DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
 EBUILD todo-2.10-r2.ebuild 1406 BLAKE2B a1bdc12885d8b93370373adae8be4d86bb12db6b2d845147d7a15c75267e570fbd0a7b386306a712ebed2c3d052ad6065a822c578148f9241c8e7104847960b2 SHA512 8b8abbfb387d5a07f8929560e4338fd64db09a57e36cfefd60e1d1dcfdd6742c09a8f0ab3576da4ac3c040336b5e2f35c43c2ca9516cb54a58728373799fec74
-MISC metadata.xml 340 BLAKE2B 8102ae5fb34dd55116c96b815406f86d08345c3e039d5c2878b8e7f8e0e4d6a60543ae7cbf9d2ba877230b40175dcaf6e7eae6d7877ee536a6ff30786e660584 SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84
+EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
+MISC metadata.xml 565 BLAKE2B 854d88ec5a9d76fba34d2feb01a36d5a9513433f1dd3301883e3213eeb1e24e1e4db0876c0b26d4e0ba68acee07177eed06912c3ce285e163f8d287510338825 SHA512 052553ce06e888905ddd230bb40e59039a42bf9e9f6684812231cc9f21d478d0e7e44d7e4ee44896258852a6778bbb507b4824a6b70150c7314b507a652e9dc7
diff --git a/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch b/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch
new file mode 100644
index 000000000000..254c454ab8ac
--- /dev/null
+++ b/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch
@@ -0,0 +1,15 @@
+diff --git a/todo_completion b/todo_completion
+index 644be6e..964383e 100755
+--- a/todo_completion
++++ b/todo_completion
+@@ -85,6 +85,10 @@ _todo()
+ }
+ complete -F _todo todo.sh
+ 
++# Gentoo bug 614400
++complete -F _todo todocli
++complete -F _todo todotxt
++
+ # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
+ # completion for it, too:
+ #complete -F _todo t
diff --git a/app-misc/todo/metadata.xml b/app-misc/todo/metadata.xml
index 18711a51920c..7c2302dd216d 100644
--- a/app-misc/todo/metadata.xml
+++ b/app-misc/todo/metadata.xml
@@ -5,6 +5,14 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ginatrapani/todo.txt-cli</remote-id>
 	</upstream>
diff --git a/app-misc/todo/todo-2.11.0.ebuild b/app-misc/todo/todo-2.11.0.ebuild
new file mode 100644
index 000000000000..4db4b749f060
--- /dev/null
+++ b/app-misc/todo/todo-2.11.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A CLI-based TODO list manager"
+HOMEPAGE="http://todotxt.org"
+SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-shells/bash"
+
+PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
+
+DOCS=( README.md CONTRIBUTING.md LICENSE todo.cfg )
+
+S="${WORKDIR}/${PN}.txt-cli-${PV}"
+
+src_prepare() {
+	default
+
+	# fix version string
+	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
+
+	# TODO_DIR variable is bogus
+	sed -i -e '/export TODO_DIR/d' todo.cfg || die
+	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
+}
+
+src_test() {
+	make test || die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}.sh"
+	dosym "${PN}.sh" "/usr/bin/${PN}cli"
+	dosym "${PN}.sh" "/usr/bin/${PN}txt"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	bashcomp_alias "${PN}.sh" "${PN}cli" "${PN}txt"
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Before starting todo, make sure to create'
+	einfo 'a .todo directory in your home directory:'
+	einfo '  $ mkdir -p $HOME/.todo'
+	einfo
+	einfo 'and make sure to copy the default todo'
+	einfo 'configuration file in the same location:'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
+	einfo
+	einfo 'Alternatively, you can use XDG directories instead:'
+	einfo '  $ mkdir -p $HOME/.local/share/todo'
+	einfo '  $ mkdir -p $HOME/.config/todo'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
+	einfo
+	einfo 'You can then edit this file as you see fit.'
+	einfo 'Enjoy!'
+	einfo
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index b2a795216d61..97fb4e0a9670 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,5 @@
 DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
+DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
 EBUILD tracker-miners-2.2.2.ebuild 4687 BLAKE2B 1c7ee9e246f29b54aa4744ef42dbb62ae50aac309306ab304472eaced129db8559c521eb35d6520bb25aeb7e5f43515264c64131ce8d9f5c2ad075973497a6f6 SHA512 493c0c9134ab39df3d3a7b91691a9198b8236af24f6f4130e58dabcf8e9694f06e9bae1ee4330bfc1c31cea9bcc7cdad0fca673c4ea9dc460c692d6b3c4011ac
+EBUILD tracker-miners-2.3.3.ebuild 4678 BLAKE2B 80681eafc12694db0e94afa292064f2d55ed737faf146942eda4d0fdcdc28c14a39d71fa7914d6c82bac39e885ae2419f155b1bbafe4fb0770e297f02a9bf179 SHA512 ded0d5a9f0f5e5f8628e70bb5f819b7c1a76126e9a96085a0769474212c6613e4d74d1b32965e0ebe297dadd74375a60cbb24176f99caa24775c7af3bfd07727
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
new file mode 100644
index 000000000000..4870ff881bec
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
@@ -0,0 +1,155 @@
+# 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 gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? (
+			libav? ( media-video/libav:0= )
+			!libav? ( media-video/ffmpeg:0= ) ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	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}"
+BDEPEND="
+	dev-util/glib-utils
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 6ea1c5071f46..d20b465f39e5 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,5 @@
 DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
+DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
 EBUILD tracker-2.2.2.ebuild 2590 BLAKE2B a50bac85eb9d02d14428ccc3a2f596a95c180c980ade8c51b1aae5669db2c19810bbdf080a2a02e8ed35bbeb24d847740de58595f10eda5c8874ebf3e90cf9a2 SHA512 5d4ff9bd28033bc3f7070a884516cfa0eadb984398513eae597d227d75222e18bb68e8248caadf5ec1ac7743bc18678a6df80c777f364e7cda918b1b4279cdea
+EBUILD tracker-2.3.4.ebuild 2595 BLAKE2B 4b241983c1284eefdc4c7c44749927389959d0b789a970b23d59adccc0ba315d2c0f2b460eb6ac761cdac70a7f0557867da1108605e978780e256c688a868c3e SHA512 11dec80a2cf4c148683ffc6dc6659354d367915d029c83992ef6a694751a24a9b0414ef3125f1369b15932dbc773891dc3b54e1e4bd99a0074035faab6ae391e
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
new file mode 100644
index 000000000000..c5a3577c1c9e
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 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"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.0
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.20.0
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	$(vala_depend)
+	gtk-doc? ( >=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dfts=true
+		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+		#$(meson_use test functional_tests)
+		-Dman=true
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion="$(get_bashcompdir)"
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index c96937682f3a..8061cc7449f0 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,4 @@
-DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
-EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
+EBUILD trash-cli-0.17.1.14_p20170816-r1.ebuild 676 BLAKE2B 61fbf3bde77a5ff36b3e495634d89c4076b53c2f6a421885b0912b11d4bdef1817328b69b82ded290b6648d8fc6fe2e633a416ee1ddcf8a360c6ccc3062a8897 SHA512 8cb94582e405d40da878e3ad750548ee9c9cdab3bf3ad93b5aaacb8b51df97254cff497ed1377f761153d9e967686c2d4b879772a7301b0dca89d6a124c3ca76
 EBUILD trash-cli-0.17.1.14_p20170816.ebuild 716 BLAKE2B b64a522bddeea46a30823970c43974497d4d0267d813b822c82d07d2bac533667f7c4158a7b4496f30395a838fa44bd59d1fbc54b30ca1c4df70d339748f6615 SHA512 7d4a0c0c3ad0fa396732ce0e1e5772260cda8ae3d1d0ae638efe6c86e7becb7a5c447129743093e935dfa77ed29f2f681d9900ab22164f2ee7fe48ebaadbd5bc
 MISC metadata.xml 1064 BLAKE2B ce5e59cc568a0542a0f94bccc46521901384ca856adaf922db9a62a4d45b86e9d179e12cff203fa8a2813131882116310122265805d54d1303b33e82680404c3 SHA512 8f74a9665e4d72c4f7dde8104189ab55d0a64c1e79abdf41920ff1ca425735cb76ce0e5fba044aae2608151086c8b0ad8a552dc15b7780c6086b8ca36d856068
diff --git a/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild b/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild
deleted file mode 100644
index 50e07cff312f..000000000000
--- a/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} ->
-	${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816-r1.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816-r1.ebuild
new file mode 100644
index 000000000000..4fd6cf1969c6
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+GIT_REF=5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="https://github.com/andreafrancia/${PN}/archive/${GIT_REF}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${PN}-${GIT_REF}"
+
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index 2b0e696c0b19..bb2e7947aa9b 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,4 +1,5 @@
 AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
+AUX ttyrec-1.0.8-glibc-2.30.patch 695 BLAKE2B 4ecc457b74f9fd5ec1df2db0d99dacc09a9ab5b5a6d3ac6b2ee4a1acea98102662b473a95e316d49d245508cecb238b1603e35784435079e34551a0c32b3d75f SHA512 ba57f0b388c5fb686f54669e7e1dcebb83b4cd40e7f70003c6798fd2e62cc4c0089f0674a6b6a21e916a57c573e2c558be4fb26aba9f8314079fc9733bfe72c0
 DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
-EBUILD ttyrec-1.0.8-r2.ebuild 685 BLAKE2B 17fa77a1fc5c76ca4851756985880fcbda04255b1f8819bd1b350a0608ee5671935dbcf06c233bd35dfc0906d3a1de271f4bf4cab6e2017070408fd93cca7d64 SHA512 ede299542ea9c2f2b027dd7b52553cc68b8bfd2a037c999919efd319482127bb5df37952e2b47dbfa0e0958429f4fea787db3a3da209fcc8f2f122ccbb0e38a5
+EBUILD ttyrec-1.0.8-r2.ebuild 723 BLAKE2B 82a12c8060960a0f24f1b42460c58bee08c6e3618aa8f3d804a0eb68bfe8adfb38f8df92efbaa3becc752ffb8539dfbc7c2317d45b3531ebbd65939ce8e10368 SHA512 0cf12ef0fb1d5a103b919da0d3488670f6bae949098f683dbaf7ca367c05b494b15614f3ad76e4b0c7b15196fe3161cf0f297b07c8d7e4d2e76e0bb2b52e2cfe
 MISC metadata.xml 575 BLAKE2B cbadaa7de1bd014a8b4d0fdce081ec4f078febf7a0884639762f714fadab3adbf6603475b331a2a07a17c0934ab0f5262bfd1191b5face6a252f7d4de8d06054 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
new file mode 100644
index 000000000000..174fc7786e19
--- /dev/null
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+ 
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+ 
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ 		perror("open(fd, O_RDWR)");
+ 		fail();
+ 	}
++#ifndef __linux__
+ 	if (isastream(slave)) {
+ 		if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ 			perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ 		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ 	}
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ 	line[strlen("/dev/")] = 't';
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index df5351688d2e..e3f42c0d0d33 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -12,7 +12,10 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-PATCHES=( "${FILESDIR}/${P}-flags.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-glibc-2.30.patch"
+)
 
 src_compile() {
 	# Bug 106530
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index dbf0a172a8a4..d7f0b22934ea 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,5 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1284 BLAKE2B 128332e054eddf03707892d4cf1d54913a231b73332ff455bff88198bcd8e0ae9bc0390cabfa5a63df3774543770d209c92b2059d1e139f49624a103421a57b5 SHA512 a97181e13f2b9c0ad58415ceb16410a26d78547d9ed19d34420031592cd3ab93f0dc548d3878d97fd2131d3827867aa15fcd0845f9c51b3f609f12390eeea859
+EBUILD vlock-2.2.3-r1.ebuild 1285 BLAKE2B 8495bed231ede5cef27cab97370ba7c4850861fbe4259843771157888eac85359f240854f776f14c6a642565088ab2f5eebe0d8ef7d7439136cb8972bb999f35 SHA512 76eb51ee9ac94da221f765da4004a17a2fe8be7865b8fdfc512e9256a01d2678b4f56e4fd550d0fdb003804ab6ac74c8d2db2210d034f5c2b9199d7989a8e18c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index acaeaa46fe0f..b6c8a2c4b177 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index e979758d5c10..b05b1b034f1b 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -2,6 +2,10 @@ AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe
 AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
 DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
 DIST ytree-2.00.tar.gz 124654 BLAKE2B db55a463c3103a544ce882da9e5297a9bde3d6e5b618332cf863dec87e6d1842197c5f6ae282e05d4a0674a8c8d52807f9eb2c163e87c1adf0b8c484e1874d62 SHA512 4306ac6f46187dafd48103348fc30cafd8cec50a196a526249c15528604ad635b0bbf96897fedcb69360b43000d0447698523168589aa917a5884252fa183529
+DIST ytree-2.01.tar.gz 124683 BLAKE2B b6ee398b21f22ded23d4cba03ab50fa45113f57341029db1bbba2bafdf286f77191904e9d785b1009d57d79d58d82dafebd4bf75753f0724c855f3410e867299 SHA512 2a3ee821462f5aec21aeb613b336831b1f94a5595a3aefc718b4e7516471f43db85e8e430f2d9593d199f455719bacb7ee19e3419806a599354c29ff49d71ae6
+DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
 EBUILD ytree-1.99_p2.ebuild 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
 EBUILD ytree-2.00.ebuild 617 BLAKE2B 656e5b1c91754b3bd8ef7623f00396e5c084f5d48f2330536c95cc4fe8a1f53dfe7f7b9322d2d7aaab6e9d10d464509e3df229b1aef0d469ac43050de376e29e SHA512 f98140497eacb460b43ed9d9c0c55ebca2500552fd7203504cd703d47f1ac873891abb82fe03039210e06040bd165f6214bdeeed1be112ad95b9c161190ac2b4
+EBUILD ytree-2.01.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
+EBUILD ytree-2.02.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/ytree-2.01.ebuild b/app-misc/ytree/ytree-2.01.ebuild
new file mode 100644
index 000000000000..3a14d3abcd18
--- /dev/null
+++ b/app-misc/ytree/ytree-2.01.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.99-tinfo.patch"
+)
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/app-misc/ytree/ytree-2.02.ebuild b/app-misc/ytree/ytree-2.02.ebuild
new file mode 100644
index 000000000000..3a14d3abcd18
--- /dev/null
+++ b/app-misc/ytree/ytree-2.02.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.99-tinfo.patch"
+)
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 456b9b7c30be..7ccb8335295d 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 630 BLAKE2B 38deb9e94fee7702c1a090411f025686c93dd131faecfa6d7231a97f6f0276cfb84f5ab53fe5e065fac8fa700be7a67d9b52f3ccffd9fc6406c41f4e73df9b0b SHA512 ff5f585165b3468f54bb7c99c7f8daf20f400c950f82bd1b583db9bbfd2b64b88469ced4d7dbfef245a0bdec4929c4a152c5725eb2b887a697e731842196b46c
+EBUILD zisofs-tools-1.0.8.ebuild 628 BLAKE2B 6eb621533d02bf8155aeb742d4ca865d815df297333a20ea4bb4e3a1c926aeb63cea97aae35e8bdb1b1029f13d736073a8f40baa2958c64d5ec7b45ec61651d2 SHA512 7e7f0c3de9e9f2d988d00374361040e627ad824fee684dbb25e007e9639c018cd0bfb44780f2f4be1ee524f3b5eb682ff4e8cc52135923610957cf7999649763
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 8cd128d25037..216503f89eb4 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-misc
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)