gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-misc
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
170 files changed, 2320 insertions, 1754 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f0a3a5906c0b..80a31cf5e1aa 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
new file mode 100644
index 000000000000..33e84c73626d
--- /dev/null
+++ b/app-misc/OpenRGB/Manifest
@@ -0,0 +1,4 @@
+AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7
+DIST OpenRGB-0.3.tar.bz2 2153970 BLAKE2B 2b913fd867cfd2d856d70d15ec91abd6a6d2822b367bc72f8f4275784793474beab4f442bc1af0ec3c3f33630b2f6b09d490d4f326fa4dbc4dbe11e4944cbc6f SHA512 629eb654636051b18da0f49cccf4e35dbe11a1373941cd355b27492b8382c113637d80039fa7aa749ae3f36bf838ad4da8da00f5abf5a0b8910be0ad1ecd999c
+EBUILD OpenRGB-0.3-r1.ebuild 1048 BLAKE2B 09afeb71ac750d12bafa3bbb62f24ddcb49709917dee694ffd48c9bdd90201c557f56946bb244dd10da2cbbf54415e38c6cb3c87f532bf998730a16d84386151 SHA512 b0942da786220726fbe5b6e388672e7e17ef0d719562926947fa8bf147d300384891930285a9b42604de613dfe1d72bb564ad5d1f755ec01df874a39d57f5ab1
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-misc/OpenRGB/OpenRGB-0.3-r1.ebuild b/app-misc/OpenRGB/OpenRGB-0.3-r1.ebuild
new file mode 100644
index 000000000000..9f8cacca569a
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_P="${PN}-release_${PV}"
+COMMIT_HASH="308bb6f9b8169c8e1c5123f9499373509f140268"
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/${P}.tar.bz2"
+S="${WORKDIR}/${MY_P}-${COMMIT_HASH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+DEPEND="
+	dev-libs/hidapi:=
+	dev-libs/libbsd:=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	virtual/libusb:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/OpenRGB-0.2-build-system.patch"
+)
+
+src_prepare() {
+	default
+	rm -rf dependencies/{hidapi,libusb}* || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc README.md OpenRGB.patch
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		doins 60-openrgb.rules
+	fi
+}
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
new file mode 100644
index 000000000000..b2cd6cbd1d58
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
@@ -0,0 +1,14 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..7f279dd 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -8,9 +8,6 @@ TEMPLATE = app
+ VERSION         = 0.2
+ win32:BUILDDATE = $$system(date /t)
+ unix:BUILDDATE  = $$system(date -R)
+-GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
+-GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
+-GIT_BRANCH      = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
+ 
+ DEFINES +=                                                              \
+     VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                              \
diff --git a/app-misc/scope/metadata.xml b/app-misc/OpenRGB/metadata.xml
index 2cb7edde3a31..cee379b15409 100644
--- a/app-misc/scope/metadata.xml
+++ b/app-misc/OpenRGB/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index b373695a8dc3..2d4e90e19268 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -2,5 +2,4 @@ AUX abook-0.6.1-tinfo.patch 577 BLAKE2B fb012f1baf2ae0915e797c9f6d506d3c636370e5
 AUX abook-0.6.1-vformat.patch 497 BLAKE2B 7f3c57b05048be59f4037416a3df8c0e3a5ac3661e59c1f1f9afb86756de7852208b565aa40f5342f9bb4e4fb10efe4aaeca90ec4b6e5c1b38b487c8493053e6 SHA512 7073146a80bedcb7bc447d741028dcffd47ce60007b4b276438fb6437e19243f3a088b99ba9da96d2ac1b64b3d0f265613aa9d0426b5c03f57fd4c834544c247
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
 EBUILD abook-0.6.1-r2.ebuild 976 BLAKE2B 125703fe65276f7c87e10eb5cc998b6a97f884271d87e30281bdaad2aa7083610facbfc77bae81c2aead15c25a7ca6a89d4bd84f408d6d6f1c8d0f52ff8ca9a8 SHA512 766506ce7fe43a5bab40f6778f64cf0920789344598ff784b394e49f8525041c606f60f53e9e9e32accdea1cdb3640b5acb9ae8c3d4bf95f13c550c76184feab
-EBUILD abook-0.6.1.ebuild 959 BLAKE2B 16201ee33578c18ac8b91ac2dbcae233421142d371fb3091a45c8975213081f9a51c8ae09fc3d03c3bbd58c33e4d8d894811acc2d877dcfaae0b0417297f7fe1 SHA512 be92ae79aa58b4ccee582460406255f4a89d4c1a7b68d7006a2f3c4986310779f897c837b2adc066538a954fe201302c54586ca0c91700c2fa98cc611c33c1b4
-MISC metadata.xml 394 BLAKE2B 7bf50f13c562023ff4695feb92a21827004491743cb073e3e25dc6ce24b69556e8027c21b5f6a4c039032c7222fae4d0a7275940b170a689257203b12266ff26 SHA512 c10bb50afc5cce1b6067662d498b43a37a6718905ef47c6e0b5452d819c704972194516868ac667a35a3266f7d408d9ebc9a92076c53d8236075135c9f034334
+MISC metadata.xml 290 BLAKE2B 0ad2ca84b0fa7d2fc2744789323d271079956e468a6d8e17d7c21e1d17ca57fb78ce17b48f7bdb97fd24e1a456d8dcf5d403b499fa1827ba70789617413b3feb SHA512 797a9fb6890d0692924901c9f1a2ab118f628fd00a293c84c466737ac69f22e592510b825b935a9183cc4e6c52529d82aff1da1b841b5dfea64bc278104daeba
diff --git a/app-misc/abook/abook-0.6.1.ebuild b/app-misc/abook/abook-0.6.1.ebuild
deleted file mode 100644
index 5833107d6763..000000000000
--- a/app-misc/abook/abook-0.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-MY_P="${P/_/}"
-DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
-HOMEPAGE="http://abook.sourceforge.net/"
-SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-libs/libvformat
-	nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# TODO: do the right thing and find out whats wrong with Makefile.in
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-curses \
-		--with-readline \
-		--enable-vformat \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# bug 570428
-	emake CFLAGS="${CFLAGS} -std=gnu89"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS ChangeLog FAQ README TODO sample.abookrc
-}
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index 164d4e3717bc..dd19a67bf751 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>cedk@gentoo.org</email>
 	</maintainer>
-	<longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">abook</remote-id>
 	</upstream>
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 2806d3cccb63..7c29be14e174 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,3 @@
 DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.2.ebuild 738 BLAKE2B 4d8991184d0dd57e1638b341e261c2b2c3ee951c048031b8960335d543dfa47e731c71159ed36da06b97522fed3de0538d2c6a740c2a7ba7a0f8b020bd16482e SHA512 cbd50a0c9e8426d2f18a7c8c188916bbf1df8ec8139406dba9ad948d43e38e02f7d35032494bb4348e02d204b5ae3ba96c8cf82b2d6cd0168b82e81142cfef96
+EBUILD asciinema-2.0.2.ebuild 732 BLAKE2B 1491de1a361d57ed94d88cbee96885b689727712d61f0b6e8ddd7f06364b8084c580278736d1d94b93c8dac159d5b006432d05642aa71872f78e2b7b3d2164e6 SHA512 7a50154749ab50c5301f7d13824d95379cf970e03865c28c1771785f5cb918a3bfc03d6113a8eb21fb1a2d1baf0e7a312c8a0c5e005c52da8ec22f3d7698969c
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2.ebuild
index 0cd5811c1933..c3687c17779a 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
@@ -17,7 +18,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
 
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index e930f2ae8f2f..6d5cb829fc68 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,3 +1,5 @@
 DIST bijiben-3.34.2.tar.xz 663348 BLAKE2B 7736823334c5439f1da93e81940f6a433b48cf94173606b1985912b408ebaa05d14866b0bbdd0978c08456fe5a592829203aa7fdd31291748148d7973ab3d8ab SHA512 75e1286aabd5c0d5aca3d2150aa36f18873cc0bfeed24a1b6aa9f4d78318d37712df71929f453b2db871021f4df148af8a9ef64d563a2158db8c1dbb620e4538
+DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254
 EBUILD bijiben-3.34.2.ebuild 1022 BLAKE2B 759c55fda7d2cc300295130996a086b0bec250bcd69553eff6703e88ed00bf62c1850e9bb2154ddcf085205e0ba98cf0b63cef6006dadabbc2914969734f51d1 SHA512 55cd1b15ae716f62737f922fb9b99e357c6b805e7341d8441bd0719bda92748f73be85694a326761fb7f3ae95896e836e6c475041e44da04ea7ac72209f1a8d9
+EBUILD bijiben-3.36.3.ebuild 1057 BLAKE2B 80798daef29dfd1ebc1b35376fb9d4ea0c9c7aeb8e55f6ac6296f1f75e5296c704afdb97997f25c49f19a0c434aa236f7fcb04cd8f6937c4332f45c0879605af SHA512 507fb9ec67b12eb908abea081899a6067fb2dae63d837d42a9fb2340ff1917e8e1a90cfc9f881b2fd4ee386af52cd83b0277c15b0bfc43b2bd4600797e5b64e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.36.3.ebuild b/app-misc/bijiben/bijiben-3.36.3.ebuild
new file mode 100644
index 000000000000..88c06ee01aad
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.36.3.ebuild
@@ -0,0 +1,53 @@
+# 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:=
+	>=gui-libs/libhandy-0.0.10:0.0=
+	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/binwalk/Manifest b/app-misc/binwalk/Manifest
index 06a40e900ec8..cd679a5da8c9 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.2.0.ebuild 1056 BLAKE2B 83b30456d4444816fe357d8997a3bdfb2f635515c0654f67bcaf7bc4d0308e436e23cde886b035cbb0a02d728b7bfa9201049d9336e1b80f5f2a73fbf949b397 SHA512 b031563d255a21e6eeef2d766495677e76bfe953c3303476b7ce635138189f08a627a36802e584ac1d096ad0ffa4066874ecf72c60213da2fe9ec5f0d205f5c3
+EBUILD binwalk-2.2.0.ebuild 1063 BLAKE2B e926b1e5706734a9ce899dba6daf046a6a411fef86d89dd97a4d1469d0eb419bc40c501055d7e7aff4ddab7a4ced05f275cff802a38f6b49358fe3bfdc166070 SHA512 ec003240e3d09a4f9472ad2a8908c32796f07d060ee1af6b553f8a0423641056635d2b96ff7879312307c47b489182676a26a0b0b4be48c14df6433605726531
 EBUILD binwalk-9999.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index a235696e14ba..a14298508c7c 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc64 x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 5623f2a7d548..5adf390f105e 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,10 +1,6 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
-DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
-DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5773 BLAKE2B 927d1cbccb998ccb5286abf1b5bde99feffe8f31bc115f32cffc560a8e3c6d948a1290ccd094b2907a8db688ee74968c2947fec3e3aa83ebdd7d18a422d4f959 SHA512 89a403d3e7c90535c076dab313dc810c4b7031a423a43141333c71cfbce32be020b6a3c58ddc99b75f719da295233ea515f16edff57d2c5863cfe05265733278
-EBUILD ca-certificates-20190110.3.53.ebuild 5782 BLAKE2B 7902584ba0350809dae7d9754e55bd5b0b99fe6d85b6d660ad0a456e6f4c32f692e8d018a74b98db584d61deaf9f1d66731799762fa7196ad4b7c178d87e74d7 SHA512 d4dd05c0aca99f6ba8ba55af8c17ac3f39a0f5017adbf852e4606b7eacdee7a1010a1d0beaf46a2e1a1aa4cd98ce2918ca2791785ff7d72bf6c61aa08d74d07f
 EBUILD ca-certificates-20200601.3.53.ebuild 6034 BLAKE2B 6aebfc6277578170f29afe806179090332b8b8c73d9c7cbae4bce84df1b11b33aac6c77f26cd3916c6a61665a986433a5f54a333f53ee14490697d73fba5067a SHA512 a19d49d5b99c35a570952dab985dec6bd321eff099aeaaf176933d6096b896b25f493df29f0fbb3bf429bd6742d5ba0bd03698792669c66585f47c271540d70c
 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
deleted file mode 100644
index 21fd74495d09..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-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"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
deleted file mode 100644
index 0297708d122c..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-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"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 91b78c9bfde9..6294028a0a1e 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
 DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
 DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
-EBUILD carbon-c-relay-3.4.ebuild 1524 BLAKE2B 2a8981118520787f99095b5675c0b7a8796254fefb7c6060ef7433fc6b0e21b2688fbe6d87a43018efead41ff2ebe7c1d0e1e2ca296a7e5f1a9cf2f59bbca275 SHA512 d5245f24d09c3f352ad2aece0052744e74fae3b312313122b43d999453391a767a9ecca9265ec0f743f60e7dbbd9843de02454c7a4e2419daffa478f750897e5
+DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
 EBUILD carbon-c-relay-3.5.ebuild 1524 BLAKE2B 550a8f03ebb9db123c73bcfff8f34030faa8d14c3864325d324043e85b6690eeed21ef17bbb00c86ae3c846a7e84b4853f840ed72afdefa2ee4b9aa62c7833f0 SHA512 248b32b60392dd7648b8301c8474fc21dba7f35a2336497487968905d9884fa088e13189ae8d285242c69c103b44ad47689bf1f070531976b7603b36ac051b1d
 EBUILD carbon-c-relay-3.6.ebuild 1624 BLAKE2B 4a9816b39f4e1de9cae7bad1d17037ce51de22e7906dcf5afeadd7bf87ad93666178eebe120e55bc5aa2a02d98e26e57efdf334cb47cf7ee23b8f8f88784e254 SHA512 25c182b338e9674c85a727b26c40bbfc3bfae285e27c5b48eb4d75be58e150a863ce1fcf23b9f219b159fa906676d5a96f1306e38a7780cddf177f449f1b1253
+EBUILD carbon-c-relay-3.7.2.ebuild 1577 BLAKE2B 7dca33bffc17b8d3b43520d56675081f9c87bfac4e2be46523f8480b32b3f3a97a9787a2a6fdb97539e3a1480b845be3e5028240ef8d8d0442458a230728e9d7 SHA512 6b2a66f85c388f365ca265f13c45d727c0d62bd999aa0c339a97076c8199e17cf14c1b013b23eefc2828f0d9150f71c378d316ceecbd17f7dac584201c7779c4
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
index 7afbf976a689..c5e804d282eb 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit user
+EAPI=7
 
 DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
 HOMEPAGE="https://github.com/grobian/carbon-c-relay"
@@ -26,14 +24,11 @@ RDEPEND="lz4? ( app-arch/lz4 )
 	ssl? ( dev-libs/openssl:0 )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
-	oniguruma? ( dev-libs/oniguruma )"
+	oniguruma? ( dev-libs/oniguruma )
+	acct-group/carbon
+	acct-user/carbon"
 DEPEND="${RDEPEND}"
 
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
 src_configure() {
 	local pcrecfg
 	if use !pcre2 && use !oniguruma ; then
@@ -49,8 +44,13 @@ src_configure() {
 
 src_install() {
 	default
+
 	# rename too generic name
 	mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+	# remove libfaketime, necessary for testing only
+	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
 	dodoc ChangeLog.md
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index cbae62141b4a..8f992f0b36d0 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -5,5 +5,5 @@ DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
 EBUILD cmatrix-1.2a-r3.ebuild 990 BLAKE2B 8f301ac3c99e6def7994cdb3fc5f8401d57af05d09251385bbc722b9e70be54739f879c9d217a9a28139b7ad7e6fa6b7024e58b9de1d89727dc3c003f3d5b704 SHA512 719ed4360766f99c242fdbb0971bdcabf671ef3f742544b573248977af0e6b4f8a262f777e917a40e32476b67238b9c321fc7177d91aed47113710d14b99d198
 EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
-EBUILD cmatrix-2.0-r1.ebuild 907 BLAKE2B 9d73d8e3f7ccb112a7d14b5c26745104a01e0ed7531f98df4ba939228130eeec1ab94cdaa8562107c1b094a62fbf76d723c3d6bc9dcd416d667bda2c979ff548 SHA512 d20d8be45944a88c85f5b208278321da248cef8fb50552c042fa68ff1c58fe9d9417b4fc96212f4e920f13772be014530847bd5675ed7824fd581035fdd90766
+EBUILD cmatrix-2.0-r2.ebuild 1034 BLAKE2B fae14e81d2d010a4e35ff92511a7dac28bd0a63767231cb95cae788e7813f1c55cebf42c70cd5286dbc37dfa3c254d151420f88875a690b51472a195e86402e6 SHA512 a2846ed4ee167404c4e3eaa78b05ab658a9402f6facb34862fcffeba3389a183ea0c5067f01e3bcc1b11334a2aeadb8f098149f70b47b71d6a55ecce203eff79
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-2.0-r1.ebuild b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
index c691bbc100c9..e25ae2c50b2a 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r1.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
@@ -14,17 +14,25 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
+IUSE="X +unicode"
 
 DEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:0=[unicode?]
+"
+BDEPEND="
 	X? ( >=x11-apps/mkfontscale-1.2.0 )
 "
-
 RDEPEND="
 	${DEPEND}
 "
 
+src_configure() {
+	mycmakeargs=(
+		-DCURSES_NEED_WIDE=$(usex unicode)
+	)
+	cmake_src_configure
+}
+
 src_install() {
 	cmake_src_install
 	font_src_install
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 3e25c4ed2b1c..15cd38a59d92 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,5 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
 EBUILD colordiff-1.0.18.ebuild 936 BLAKE2B d02f7bee2f06e05df8ea94539d9052d0ac95048d5b94901b9bdb34c81ded3c039192c8a995858501082f922c0dea0c371fa7feb805a065c807487a4c7ede2ccc SHA512 65d2e2eed05517b65449812096d8541d7b83ad307fbbf07e68e0aae912dda60132a7bbed3b576451322252ac725c1df45f820a75882354b500872cfbe07434c1
-EBUILD colordiff-1.0.19.ebuild 943 BLAKE2B 3619b188f9a1e1c059804004e662d811c6ecddddc8b5a5dcce3c49f84e630645ec0c888248822159adcf699d5808c265a2fdb61a21c5c2e2084a4c0b8d1d0371 SHA512 01cc26585bd7df0870c95f75f89a3461a6cefd506e530bd844eb6d9d420280e9ab917caa001447b4aa4fe13b46492f21b020df79e88636c561a9534c8bb4d128
+EBUILD colordiff-1.0.19.ebuild 950 BLAKE2B f78640a9ff840d7fb576080686ce937ca389a734f010280960076874811296472b0f11397a15069f0a1aa30333d2b1ce0baa22a67b1b34b3bb449a35617818cc SHA512 fe7afde7ceef38fa16b13532ec00ad9d9b4b8e683798f271c4c843d601661d45c388606d6ba111eeb2d580ff0b229fffcc9961e9f47a6ceaacdfe6f009d1f383
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index a611018c9e5c..57707b8528d7 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.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 ~arm64 ~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/dateutils/Manifest b/app-misc/dateutils/Manifest
index 5f69e85ef73d..c5a541f60c34 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,4 +1,7 @@
 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 604 BLAKE2B 7b9c29347a8295c5979d7241e712b96c720babae149e24c128ee39c19739c0d9233c3acc91441ca6a6fd6223c072b6d36a1e7f4406718d58876d5152d0aaf39d SHA512 380a0ca5edfc1bcc2bb96a71e508eca7338b79f31b7d829f11de84c743b7c92a5415d730b80242c3ac6f3dbe09ca842f33068206d859d44d88c6cbcce8ec853f
-MISC metadata.xml 254 BLAKE2B d95972610e33fb3ea47a13570a20c2f807ee9a8110a0450e45461649c4d61ef723abeccacae55feb4c7d4c31f0808e750de98549eaa880f043b4ebce26aa0bd6 SHA512 3537bb9cb6329ac910efed6898ac049d4591904d1fc1955992ab527874af0c69ab872c293a4b042bf6b0ff61d59938442321aa9fc4b0049877a4b348139cb465
+DIST dateutils-0.4.7.tar.xz 649932 BLAKE2B 710c22d63fe3c8f77c69c97c405d3d4aa5c51de3d5768076ca24f8b2be0d6033ae652825e528d99c36f382e25c4e0a60eaa7cb9eec58f6b814d60d513b37ce7e SHA512 480943c32585efd8f42958d6e7d3304a37568f2134c9561d6e0b38f4719fd149ec7e55c559a5e73e97e1c9d217f3d53fe76a7e6a9d3114c040915ebf48db4666
+EBUILD dateutils-0.4.6.ebuild 798 BLAKE2B 656721cb90bd9e00e46a590312c5600acacbaf4d7333273e86f55ed7b70a54e7e81ea47a6e63a4ba9290f4b4588a267376f9dd1d7a1b84ae6fc57ce4e5f1048b SHA512 fe670bd080919f910e96d570ef25d122fc243d2ae63782698085151f2900f41e5331a430ee9db1764c5d40e0fead91c5a4cdfd33e5c8f3fdab836a2de4d79fae
+EBUILD dateutils-0.4.7.ebuild 806 BLAKE2B 6c223263ec7856f78060555f67fbf4d285a4877a3c40cbf30963ab8c3a9a89a86894db2e8624892304edf16e3faa09d90bec06a43089978b89652749f446820a SHA512 642a07707ab0ff66a6d77a20321645930000fe338175639923e068887cb3f1bd40228bda64c00cbcf6397d921fa34deab771a2060816086481ee23bcb16f4ecc
+EBUILD dateutils-9999.ebuild 736 BLAKE2B 795e03b4a34d334b98ebf2fae42a4ac0ef4fcf3b3e477006fe6ca06ede93483882fff8ac337f51d71a2f1ce33fbb1d2b753e652cbabc7903f39fccc685c6403c SHA512 09cd4bd1a2d8d99de4cc2169d8af4136cdb8b1bc2593196d12b95bf6021e994f74ce9e9e8a2fc25fed7f1ca97b26496d7cd2a58e9d8321bc5f5c3eafd6243a8e
+MISC metadata.xml 466 BLAKE2B 139f2de9d29f35b8383cea0f9a2f46b1673e8f835920e15804737d514fdf3e14cd0acb06b48a1bfd8a8bc5f98bf0081c628815afb5a531eb1ec60745ff7d4b73 SHA512 ed296fe03087393cdb64d41ee5cf326b9e2865a7a541a2830fc4d33d3009b4dd672f7caa1fb65a422a66e2fa22fb57b0ba109c01cbfb8892dc82b7fa6561bda8
diff --git a/app-misc/dateutils/dateutils-0.4.6.ebuild b/app-misc/dateutils/dateutils-0.4.6.ebuild
index 7b12131bfecd..c785ee95ac5f 100644
--- a/app-misc/dateutils/dateutils-0.4.6.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.6.ebuild
@@ -4,26 +4,35 @@
 EAPI=7
 
 DESCRIPTION="command line date and time utilities"
-HOMEPAGE="https://www.fresse.org/dateutils/"
-SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
+
+case "${PV}" in
+	9999)
+		inherit autotools git-r3
+		EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
+		;;
+	*)
+		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+esac
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/xz-utils
-	sys-libs/timezone-data"
+BDEPEND="app-arch/xz-utils"
+DEPEND="sys-libs/timezone-data"
 
 # bug 429810
-RDEPEND="!sys-fabric/dapl"
+RDEPEND="${DEPEND}
+	!sys-fabric/dapl"
 
 PATCHES=( "${FILESDIR}"/${P}-unportable-sys-sysctl_h.patch )
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
+src_prepare() {
+	default
+	[[ "${PV}" = 9999 ]] && eautoreconf
 }
 
-src_test() {
-	# parallel tests failure
-	emake CFLAGS="${CFLAGS}" -j1 check
+src_configure() {
+	econf CFLAGS="${CFLAGS}"
 }
diff --git a/app-misc/dateutils/dateutils-0.4.7.ebuild b/app-misc/dateutils/dateutils-0.4.7.ebuild
new file mode 100644
index 000000000000..88466aa59af9
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.4.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
+
+case "${PV}" in
+	9999)
+		inherit autotools git-r3
+		EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
+		;;
+	*)
+		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+esac
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="app-arch/xz-utils"
+DEPEND="sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="${DEPEND}
+	!sys-fabric/dapl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.6-unportable-sys-sysctl_h.patch"
+)
+
+src_prepare() {
+	default
+	[[ "${PV}" = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf CFLAGS="${CFLAGS}"
+}
diff --git a/app-misc/dateutils/dateutils-9999.ebuild b/app-misc/dateutils/dateutils-9999.ebuild
new file mode 100644
index 000000000000..7d96bcf272a9
--- /dev/null
+++ b/app-misc/dateutils/dateutils-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
+
+case "${PV}" in
+	9999)
+		inherit autotools git-r3
+		EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
+		;;
+	*)
+		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+esac
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="app-arch/xz-utils"
+DEPEND="sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="${DEPEND}
+	!sys-fabric/dapl"
+
+src_prepare() {
+	default
+	[[ "${PV}" = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf CFLAGS="${CFLAGS}"
+}
diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
index 11d80f64486e..c0305048faa1 100644
--- a/app-misc/dateutils/metadata.xml
+++ b/app-misc/dateutils/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>coppens.matthias.abc@gmail.com</email>
+		<name>Matthias Coppens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
 	</upstream>
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index b161212421cb..db35755cfc1f 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,4 +1,7 @@
 AUX datovka-4.15.0-appdata-to-metainfo.patch 404 BLAKE2B 667cdb41220c9de92f1eb60affd48045c45494dc14c6c6ac1cbd79b56ee1e5e1174f99b4c7bfe7c261445272304ad9dc8efbaf885d26fd61e6d9e6191c74a16a SHA512 a70432722acb3e34295fbcb8e4657f4bfd3a372d329c20121fdce2b52ad487a31b10ac78a8bb97a0107af1355909d0daa67d4f9a6cdf2fb8395ce60073a620af
+AUX datovka-4.15.0-include-QPainterPath.patch 344 BLAKE2B c1de736f8936ebf8104d9977e5c7fd274c6c35ef56264ed94174e106d07efadd2c2dec0ad4a6718442158d6fced3da0ab48742b211001f95a46971df02a0e227 SHA512 2211aa5122d3dc15fb53fcee4b392ce527b9658dc6679d934c068ffc1a8eb67ae546e9e4bc8a937fdb712c9f34a5aeea70f6cb5e1df7d72976faa806d827a9c0
 DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
-EBUILD datovka-4.15.0.ebuild 1146 BLAKE2B cf5271a931f258bf7eb97e8fb2233cc614642aa020e699826a5eceb58eac759bc11d8ddd901402d811badb6352ea4df992c27d47dca7dbd4eef10175b6d836f6 SHA512 6a0a803a88c6cf678d33bd83adbdc20386cec487842e3faf31a95894a758930ce63d355fa05f0fe5c26ea9c8bf767302514991512a7a4c616fe31fb6d65c5c15
+DIST datovka-4.15.1.tar.xz 2821764 BLAKE2B ebc0eb75b239579224f77f1894d05fb617dc1556033ee1e82a27fb13b71284dcbe3b4dfff1711084869f7cc82837487f3676d9c3d681e91b0232cee0c77b7da0 SHA512 7f2286f6af5350be668a83098d65f49ead31473b0d2f3d4d336089bdd73cf6a6cec007112c0e10f08ecbb90e1a29c2ee12cd4773f41c677ebe1127366d06ca20
+EBUILD datovka-4.15.0.ebuild 1195 BLAKE2B bf3cf76bd71bd77191d480c723b89958202f076fac33b59c1de0e2dbe5d126c0737550d10db3420bff461df9291f6dbab733af88f41783e96d4a5e2c92c246b9 SHA512 3e94d0958c1c5988ef72cdb3e86a051a394d848e9cc333a876b3d2fd74917f393885b3fff3d809274160e1ee82c7b800757660dbacedcc99a6fa86fd7d0bdd1c
+EBUILD datovka-4.15.1.ebuild 1089 BLAKE2B 4c0bcf9c74adc67452e9f568a0ffd4b7a3f90db313fcb9fc33624a9b51a17b8303ddf6333d9854120c698342dfda60f3f5ec267381edcbb4e5325c3ba33d5bac SHA512 cccf1623c0127be3c5193693724bdbce09d8eafee481940c3dd40cca267ce45d8ab5a049bf314dba07752dc6ba1af23403f269df861147693aed10ef65789404
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.15.0.ebuild b/app-misc/datovka/datovka-4.15.0.ebuild
index b0cb647f2d37..c1b58089938d 100644
--- a/app-misc/datovka/datovka-4.15.0.ebuild
+++ b/app-misc/datovka/datovka-4.15.0.ebuild
@@ -33,7 +33,8 @@ DEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 "
-PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch" )
+PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch"
+	  "${FILESDIR}/${P}-include-QPainterPath.patch" )
 DOCS=( ChangeLog README )
 
 src_configure() {
diff --git a/app-misc/datovka/datovka-4.15.1.ebuild b/app-misc/datovka/datovka-4.15.1.ebuild
new file mode 100644
index 000000000000..89144ad68b57
--- /dev/null
+++ b/app-misc/datovka/datovka-4.15.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 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.14.0:5"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=net-libs/libisds-0.11
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+"
+DOCS=( ChangeLog README )
+
+src_configure() {
+	lrelease datovka.pro || die
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
new file mode 100644
index 000000000000..e381c40b5925
--- /dev/null
+++ b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
@@ -0,0 +1,10 @@
+--- a/src/delegates/tag_item.cpp	2020-03-04 11:05:08.000000000 +0100
++++ b/src/delegates/tag_item.cpp	2020-06-08 14:52:06.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <algorithm> /* std::sort */
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "src/datovka_shared/localisation/localisation.h"
+ #include "src/datovka_shared/log/log.h"
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index 15878e37db3b..1120f51c7699 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,4 +1,6 @@
 AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
+DIST ddate-0.2.2_p20160627.tar.gz 8079 BLAKE2B 7885dd34762297df801f9fe5736d1409280646cc9295780f3fa6da0a06127fa455c96117883e1087b0390498de1b58ac31071434e6b9e30a0f6a15b2e4c6c279 SHA512 279e02e1846cc2f505466882828aa699eaa7206e0025575babdb33738b920291d65ac4082f58c77e6046e69c2604b05de67f5b9b3cbc64589ff28a27e2256eef
 EBUILD ddate-0.2.2.ebuild 514 BLAKE2B a8a35a87f6df49c2a907bce74ed184af0720308265bfee13e7d4fdf9c95ad2477530a1be92e98877e6c9b2d5d1fda1752f0df61216877204a7b583f7d2c66e5f SHA512 c75d4c255ce6455cbbc249b40c99fcfa5d358534b3485843a652e264048f5c4933cbbe9e148e3266252ad3e7598546fbfa2d5d0b263715746d3fe8e1a784e236
+EBUILD ddate-0.2.2_p20160627.ebuild 556 BLAKE2B 87a40721b3a3fd0d0d4d7f53fcbf686b8ae2fd31929e7bb97eb013c582d813c982ee57660ec6596c651ab65b0843da2df48d0e32f592bcde67ae9f2f345f3d0b SHA512 148fca981abb4006e21866ef2a03d9d86e1947548334c715260d8806eaaced6b4752301c75d3a284915c7327b1f62d44f483891f56974631abbd9bbd95150bf9
 MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009
diff --git a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
new file mode 100644
index 000000000000..fd6d45d5ff9a
--- /dev/null
+++ b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="899ca665a0cb725990c33415dc3c0261dac7fe46"
+
+inherit cmake
+
+DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
+HOMEPAGE="https://github.com/bo0ts/ddate"
+SRC_URI="https://github.com/bo0ts/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.2.2-dont-compress-manpage.patch" )
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index fed9ae4bf7ed..8dc39d50d7af 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1,7 @@
 DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 BLAKE2B 558af647f21839f6df8a19cb84237aeb8ad5d023b1373de3180b9a88fcf7425d17797348cc0e2d44a4d5d1d715a429475873b82d0d8c728d8177b17d77b9cc42 SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80
+DIST ddccontrol-db-20190826.tar.gz 76861 BLAKE2B e5f88dc74363b985b34ab7c5427555f725a4c0ad76e9496ceb914062f136443afa85e77710e7966884208e7fb2c30922d340501f365328d1369e76a9088003ce SHA512 f1939568fd77b9a6faf5d848cefe90910134ed4a661d07a399c88bdfdba7f087111dfe95332355080be90fa88011909e28b302248d42a9b909028eaf39a40a7c
+DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
 EBUILD ddccontrol-db-20061014_p20121105.ebuild 786 BLAKE2B 68f4b40d77ea7394256781c0b34eda18d25d07ff76146cb5afc8bd7d21cd168e690ccdeb7c75ad6993ebb07eee3f8ed9292e80761b96b33cdb527e898a78a102 SHA512 939b8614ec2fbaa26b21c6f4fdef1d72e401e52c6ceeb27cfa78eb8227687986f53889065c70f79e29d79e8d238c46dfaa5d19450de6a34cdcdf67653d1e0a3c
+EBUILD ddccontrol-db-20190826.ebuild 771 BLAKE2B f181d47b68c04b2ac2a8c87f851a58b0855365a6c90ed6eb71cb32dbf80b01ec459c26881991377501317063dbb603ea3ba4233c30d0d2e4a8c86c3b6a697b57 SHA512 911311a5df27d7ece186aa2c3ce81c7222966826ceca7c3a305442141ff4b3cb3a52029fd95fc42165d8a7c95191325c843577a0b05c36f78873a67e4fae66ba
+EBUILD ddccontrol-db-20190826_p20200613.ebuild 827 BLAKE2B e079358faa755e6d3a44231929581001861fe700f0800fa2c4f693685c73eb2bd01c6a791c079053e9f2d968d3a9c64f6c0ea5fd7fd5b88b3272c7b69a9eaa05 SHA512 4612cc9f5b24df3fddfcf5e95d6f8bb9662c1bb25da4025b8fb7fa2132e0aa26c79fa6f4a93e723ebf11d18fe62b2c263d114612f06a0d6124ef1485d9fcff6a
 MISC metadata.xml 318 BLAKE2B 7d2751717a71de1512a92f653a63ace19241e11dff6e2a0b982a87f3631757450b5c2430bf273c5d441e649569bd6612e5c199b37ac8da3f14b5f4440719eeaf SHA512 3ea6d2450579fd400199cc8c06193b9a0070c0efd4ed8016268d7e097ad35f5e0987fb1b6326076b736094df0c5976e33f1e4ef94ccccd789de6662f547d46ed
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
new file mode 100644
index 000000000000..afe9ca3a52f7
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+#COMMIT_ID="..."
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+		dev-util/intltool
+		dev-perl/XML-Parser"
+
+src_prepare() {
+	touch db/options.xml.h ABOUT-NLS config.rpath || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README.md
+}
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
new file mode 100644
index 000000000000..773bddb8a141
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="e75714979448b2f513d5ce65929899fa32a59044"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+		dev-util/intltool
+		dev-perl/XML-Parser"
+
+src_prepare() {
+	touch db/options.xml.h ABOUT-NLS config.rpath || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README.md
+}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index c32fbb2faf98..aa716b2f9048 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,3 +1,9 @@
 DIST ddccontrol-0.4.2_p20140105.tar.gz 177771 BLAKE2B eaaef394a6e9240d1742cc7fbd4ed80ff58315713d3977f8bd1c64f09465fb6a6f9cfb6ccb49e3190291256b6c816512128b95e2dfa16f31e8fadc2aa9367457 SHA512 7a28e9b81ee14e0431c57d372c8d43f861f61c35b441111e1f42d1aa62c333b0cc6a101dcb39d30e9661aaa85a02d755e4adef3a9b20a6952e1599e3ac12c72f
+DIST ddccontrol-0.4.4.tar.gz 164389 BLAKE2B 480b712fc5911fde35a55ff8602866888850edfd6366bf0fb78ac3c726afed7745975b70c3359ae81c2583506ec1b2a2fc3c8a7aab9e8032f16bf27612430084 SHA512 6bc5587bc790492f13c677bd7a48f5ddbaa42f680c56c2fa18488ba5d322b853f6fb520c1317415a20a5df03c24c06edddb5e777d6fb34a34ee459170ae92119
+DIST ddccontrol-0.4.4_p20180123.tar.gz 165833 BLAKE2B d1af2e5f2d78bb9d8cb817e8f2666f70c5fc431a3a535931ea91fef5a2e9500e20e989d24d4cdea4a1c83631df120071bfbf845d342b1e826760f622c9dc5844 SHA512 c49a37e6231f0002a1dd387e2f2f0e1e4f989406bc84320011a55f596c8d1d7e0f094c8ed574db30fd0546fde64c8bd16350412cd4f64cc83b8d44a5469afe1d
+DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
 EBUILD ddccontrol-0.4.2_p20140105-r2.ebuild 1895 BLAKE2B 6e51dc2d5ee49dfd3c77b680c285fc306edb2700019f51feff8892ed2b61310e4004190648fafda4fd5e5dab50c13b9e2ffe02b66372366bd709875ccba242fa SHA512 d4935772dfef9bd11a3f31609d8d160c18075f04f89274086716e493d796f6f14fc766fecbc89310de106789c2cc28e839a4d06b302c724e0b3f99b17fee28d2
+EBUILD ddccontrol-0.4.4.ebuild 1852 BLAKE2B e49447cfc9cd88e3ef4fb631aed4c703bab2a8e6da52abefb844cc0e6cde41a573e9bae0a19b606e79789d563f5b2cadffc2914e6d5036e9754f55750cecfee5 SHA512 a14e0f9bbfce45fa217fe07604d7b6e4c44624a6f379e2c533246f77fb9167839d4adce2344cbfa3af624bc5bd07977082558d809b716a65ab51886e66ac26e0
+EBUILD ddccontrol-0.4.4_p20180123.ebuild 1933 BLAKE2B 616f437d655df0d13573d4b6952ba974556c5a106356e355be8809064d2770fae9820191be4a89a7167e35863a2bb8f8333f366e25bdcaa31df80dc51cd12f7c SHA512 42ec9661a22ee8792f074cc2f3ca206bc833ca6994aa6131e4937188b8b2dabd29711cc5ac469ac33ee0b39ed5b9779e756c830873e6a9243b7e75e993d133cd
+EBUILD ddccontrol-0.4.4_p20200630.ebuild 1947 BLAKE2B 18fdaf726bf8c96a5348d19a9db8c04254448e7d390e466886a037208ce139a43fae45ecad16427d4ae5cdb9e8b1e3ca3f3e886b587826ad599b6783c9162874 SHA512 ba41e167774ea1048efb12e519b97634479e323ad866a7289f4f797ed6d1dbe8edc44a76cf7df7c33820bbc709e3daa71ae42350813c4513f73509536ae803cf
 MISC metadata.xml 417 BLAKE2B 8bd8767a184790aea7b6a63383a56d25de54c68a044a6549683a979910bc6d6d8d518bcd71acd14b393f12a8c43cd8c7ba6bac1775f7ed28314bf56d4a97f9fd SHA512 8e2d095bfa5e56a10f9187894c34d1b8a4e6b3562c10c29ce374f5efde918f1d097e2678f044a838b31778bd7f9333c7fa7c41d2f9fc2011d263d4ea0831bf04
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
new file mode 100644
index 000000000000..5421c981fa01
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+#S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+	dev-libs/libxml2:2
+	app-arch/xz-utils
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-kernel/linux-headers
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		>=dev-libs/libxslt-1.1.6
+		app-text/htmltidy
+	)"
+
+src_prepare() {
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,ini} || die
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c || die
+	fi
+
+	## Save for a rainy day or future patching
+	touch config.rpath ABOUT-NLS
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	# amdadl broken, bug #527268
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		--disable-gnome-applet \
+		--disable-amdadl \
+		$(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable pci ddcpci) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
new file mode 100644
index 000000000000..ef19bb42b26a
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="7c74181ed03839fb91e36c6012784cfce2ebe1a5"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+	dev-libs/libxml2:2
+	app-arch/xz-utils
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-kernel/linux-headers
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		>=dev-libs/libxslt-1.1.6
+		app-text/htmltidy
+	)"
+
+src_prepare() {
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,ini} || die
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c || die
+	fi
+
+	## Save for a rainy day or future patching
+	touch config.rpath ABOUT-NLS
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	# amdadl broken, bug #527268
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		--disable-gnome-applet \
+		--disable-amdadl \
+		$(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable pci ddcpci) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
new file mode 100644
index 000000000000..2f7c7e8748e4
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="f3d003f63aaa0407d3147b04848e0722f78695d5"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+	dev-libs/libxml2:2
+	app-arch/xz-utils
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-kernel/linux-headers
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		>=dev-libs/libxslt-1.1.6
+		app-text/htmltidy
+	)"
+
+src_prepare() {
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,ini} || die
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c || die
+	fi
+
+	eapply_user
+
+	## Save for a rainy day or future patching
+	touch config.rpath ABOUT-NLS
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	# amdadl broken, bug #527268
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		--disable-gnome-applet \
+		--disable-amdadl \
+		$(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable pci ddcpci) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index e5dc8f288d98..9c624ce87cdb 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,5 +1,7 @@
 DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
 DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
+DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
 EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
 EBUILD ddcutil-0.9.5.ebuild 2775 BLAKE2B 6d40485ba8b5ded81e0c3e378126b93e9b7cb8bbc71e86a516322a8b3d564275059c15b0f5f493601abec201f8b7ddeae30820d4bbef73591f26236bb9a26f24 SHA512 31b73b8e481f278275cdd4a488d49076f2a5da74927d34f9da012e3b13152925e1106543ba1d9695118fe3732a8ad5dc72ffcb45a1aa1200536b8a1a1fc58be6
-MISC metadata.xml 1209 BLAKE2B e41b796aa6d3de7f54292a07c2aff7b116033953db912e0eeb513e946e5d6f2dea5c7a02e20185217e4aa04b29f40c4d4b6f8fe2681ee0cd51e1e56847c36b59 SHA512 0cc976d55a11f0dc4fcf5711dbb1d8069551103ec2ba7faa4ceb8458529a6adb80098bbbb90f43c9e772487f43e9035346fd2736e8203ad307570b21879b19d2
+EBUILD ddcutil-0.9.9.ebuild 3224 BLAKE2B e41980da150d93833005be9c4b1463a7ed4db0e3e3213ae100d059ec3375a558bec66c6c771837cd7d9141a47e47e9b7746fbd0deddac978f7254f273efb07f4 SHA512 08a769977bfd8b6e45cd7d7e2463d3b3d62dc3594493621b0ca5ba1dad062af8c05c74c174f1ab1302b80354e301a5d1818def7e1d08977bfb5cd7516c553e0e
+MISC metadata.xml 1292 BLAKE2B 0b413e4a4f24a9ee9639994005ad818952e2ad1763c78cb254646d8d4a052f6c36dcc4709254fb4441d51c193f209f8d467a02537c0c1fd4c32c9bebf1bd8d13 SHA512 d70a5879bf4bbd599ac415bf4df1b1abf59f24c04d3ee3932c72207f97ada739e2fca73600e0c5694f16c91a87db6917903d374a45d867b087e82ed814a7a130
diff --git a/app-misc/ddcutil/ddcutil-0.9.9.ebuild b/app-misc/ddcutil/ddcutil-0.9.9.ebuild
new file mode 100644
index 000000000000..08aaa306dd03
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.9.9.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/i2c-tools
+	virtual/udev
+	drm? ( x11-libs/libdrm )
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils
+	)
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
+}
+
+src_configure() {
+	# Bug 607818.
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		# Please read upstream's note about the original purpose of these flags before re-enabling them:
+		# https://github.com/rockowitz/ddcutil/issues/128
+		# As of 0.9.9 the following no longer compile:
+		# Python3 & CFFI is already broken as of Python 3.7, with future removal;
+		# SWIG : Python3.7 breakage as well PyFileObject vs PyCodeObject
+		--disable-cffi
+		--disable-cython
+		--disable-swig
+		$(use_enable introspection)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		enewgroup i2c
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			enewgroup video
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddcutil.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+	fi
+}
diff --git a/app-misc/ddcutil/metadata.xml b/app-misc/ddcutil/metadata.xml
index 4ed719a346cf..e65496c21880 100644
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@@ -1,7 +1,10 @@
 <?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>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<longdescription>
 		ddcutil primarily uses DDC/CI (Display Data Channel Command Interface)
 		to communicate with monitors implementing MCCS (Monitor Control Command
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index c6d16a0c07f0..1154e3684217 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -6,16 +6,16 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e SHA512 c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
+DIST elasticsearch-6.8.11.tar.gz 149101114 BLAKE2B 7d6550f817c9b367a096dd0637c3d4dca6f68b95f2d3554273e5c32b5d72b6583c5ff84d2811b0cb191d2fc91d7f8bf5dbaeda3bacb94feedb018d097006f819 SHA512 a2dcbaac26b3f35437f967848fe7bfb1b873b3051bd976ccef56bd4e9f99099d8b497d60da892151939c6f63ecccbee44f550e313474cf132407d145cd1667e9
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
 DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
-DIST elasticsearch-7.8.0-no-jdk-linux-x86_64.tar.gz 162422169 BLAKE2B 035b8405cfad0cc440c5732526b0b9bbf42466598a921c42e4964ffb441475244f6b45803556a93a207e63dfdbfb92eef731add3d71ebe737cdef70e0cb50d34 SHA512 0fdc8e3d9c83c35bc1a01ceeabdbcfe192c6a0243a2def923a14198d5e41ba804725ac39a2b6287a932b4807b3cb359adb0348fd96506d556d4cb280b6c01071
-DIST elasticsearch-oss-6.8.8.tar.gz 68655829 BLAKE2B 808b9dd49f7d9c9968e6e1c5dcd8d1150d3638b8380ad0608f1e85f00d98c6da6d0c9c324f244b510d35ecec0f37b40e29fd0761b83118e137cf394c231cc0e8 SHA512 7c5972d365a8a2a80c351039ff54a274bb1f95379d6f4feab4fa01360541bffa58409ffac6030acade24be54d1cc57e7ea24a7cf29531aba35a565718e30288d
+DIST elasticsearch-7.8.1-no-jdk-linux-x86_64.tar.gz 161598020 BLAKE2B 7950d9570760683a939c961c0babdf66a57adfc49d541d75716ce1dc379f211f60edceae06855de0f4bfe50c9a6b1ca0296aa58fe324a28b009fb8cfe5c2a5d7 SHA512 1fd0dc28cc12f4cafe8499ca2894a00f0aef506429a3cd5fa4c9ec006e4dd281099bd0f41f1e0ff9d67ef25d5d1cf3be7f6c43c1758ef3464ee4b650fb560842
+DIST elasticsearch-oss-6.8.11.tar.gz 68247334 BLAKE2B d35bd5b2cec24923b03fe21e5f31055d0380c71908f9610d9897d7b97e599b65fbc98d04e905f35e7042f3b2697e89f9e927cf1b2b5b652f3a0e8731caaeaf54 SHA512 f92bd4dc68d8a42c1c5a8f424e375e4996d14d8860aef2e9a3208613a438543647e9999cdaa18870de4fb1f7d514929e535891e5cd6b8a668b2c90dab0106c51
 DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
-DIST elasticsearch-oss-7.8.0-no-jdk-linux-x86_64.tar.gz 75549734 BLAKE2B 8223e0083d9a5199457957d22c8413f6d0d90c5c21bdcf4d9b573a7f3dc09dfce6c7dce5959e23c3d9c543df21d7fbbe1f7ba1124d40966d13cd7ddf8aeb4813 SHA512 4fe29f5395d938cf51d23ef7531f4d1b4c4a052d842ba2f77fe822a0986703315b2211602bf250170b99bc672fc0de09f0d1a04752322f398b6a55a057d9090b
-EBUILD elasticsearch-6.8.8.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
+DIST elasticsearch-oss-7.8.1-no-jdk-linux-x86_64.tar.gz 75134201 BLAKE2B a3c88ad5f94a5cebefc1a5a3a913a62bc6c8751a78c179a05667f47da71c41b480edf8d7f962ad34aa8ab0eac8168d7b8cd57f33068c17ae7e0a8d5414fbc924 SHA512 f0caa06c1172b25d8f9cb9ddced72185aaaabb1b6d7f31fe1ba67172346236651ca3bc560e7ef206b4bf9521f228d46ee98df2e41b129253215135b583086ccc
+EBUILD elasticsearch-6.8.11.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 EBUILD elasticsearch-7.7.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
-EBUILD elasticsearch-7.8.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.8.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.8.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.11.ebuild
index 6191d3d9e2e0..6191d3d9e2e0 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.8.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.11.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.8.1.ebuild
index 2155270debec..2155270debec 100644
--- a/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.8.1.ebuild
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 35b33ceef27a..dd5c51c29101 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,4 +1,5 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
-EBUILD emelfm2-0.9.1-r1.ebuild 1954 BLAKE2B 39a847806bac8df2b603115cdf65a2890e019b0216a0b4634c3554726c2ba36e7c0037016270dda1f5c3d0113bb622c8b2fff953b42f5752db289e2d4ac70763 SHA512 6047de99b1c4241832c7cea848e4b0a013054443fe7797bfc55a5a58ddc8082648209add04c725bc84ecacbb4a42c13bb15fdf096b483de5da4d19406f8ea553
-EBUILD emelfm2-0.9.1-r2.ebuild 2002 BLAKE2B 2f39393f1578d781777d843ff0c7dca35c9e0baa3d0ddcb4917bb08feeb0939f1349bfc87d49fc44d279a36cdd8f35b85baeb069bfef269b14a4d7c1635ca5de SHA512 b4302df6e0610e4c71d9faa1593ce7b3542db1d509820065da5a31ed11af72416549823fdb86a15c2fa872490fa656bdcca2ac65794d265fe25fb57b45d27389
+EBUILD emelfm2-0.9.1-r1.ebuild 1988 BLAKE2B ac7a1ad1c066a94c8570461ff7e9c8c4e8e35ea265de56777a64144116ba179d83963b2d89ca9425fc6e3d04343ed78035f1dd7f57e4efc55d9d77fd77fcc4b3 SHA512 9a1375896d3f337eb332c1456d54a259e35f91ee5a8b56cd8e3a6a41fd7c15acfac6c3bc9984dbddc85b01657a9707892b5e5e69a9a1deae63d1dc8e02b9cf83
+EBUILD emelfm2-0.9.1-r2.ebuild 2036 BLAKE2B 938c964ce1522a4a830cf754ed94578d228d8aa65be953f1cb7b1600412ac2f36c9ba102cfdb67e52213637af2d9bd8f51984cd66036d661ad66985a3e938436 SHA512 ce9d208a29415e801167cc97f638e73ad4d0ef3a4a7ab0e56e28873b893e602ccda5125a042179a4a837d898d14e235b3a3ce3341656a42ca384c4b5a97e2f97
+EBUILD emelfm2-0.9.1-r3.ebuild 2348 BLAKE2B e6d7c6d3ebd55131e4b8052552b417f249aace60d08158ad7357881594a56eb003d12f97d18d666a20901f3375b1eedb161e7ab801e02bace351f059dbb5d4bf SHA512 f2c1cae27cedfe51165644eb017fe3b4516914c8869c66672395bc97aa2e40aefaa8e5d8638bf3454dcc36d2f67af3f54b0ccff6f620e09e3fa34d4e5dacaab8
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
index fdc2b9bb3424..bfc29fa412af 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-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=5
@@ -33,7 +33,9 @@ DEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
 RESTRICT="test"
 
 src_prepare() {
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
index b4d937e4bc69..1679c68b7eb3 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,9 @@ DEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
 RESTRICT="test"
 
 src_prepare() {
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..280416063e84
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic multilib toolchain-funcs xdg
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="https://github.com/tom2tom/emelfm2"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl ansi gimp +gtk3 kernel_linux nls policykit spell udisks"
+
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
+	acl? ( sys-apps/acl )
+	gimp? ( media-gfx/gimp )
+	gtk3? ( x11-libs/gtk+:3 )
+	policykit? ( sys-auth/polkit )
+	spell? ( >=app-text/gtkspell-2.0.14:2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
+		-e 's:@$(CC):$(CC):g' \
+		-e 's:dbus-glib-1::' \
+		Makefile || die
+
+	local lingua
+	for lingua in ${EMELFM2_LINGUAS[@]}; do
+		has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
+	done
+}
+
+src_configure() {
+	append-cflags -fcommon
+
+	myemelconf=(
+		$(usex acl WITH_ACL=1 WITH_ACL=0)
+		$(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
+		$(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
+		$(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
+		$(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
+		$(usex nls I18N=1 I18N=0)
+		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
+		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
+		$(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
+		DOC_DIR="${EROOT}/usr/share/doc/${PF}"
+		DOCS_VERSION=1
+		STRIP=0
+		WITH_TRANSPARENCY=1
+	)
+}
+
+src_compile() {
+	tc-export CC
+
+	emake \
+		${myemelconf[@]} \
+		LIB_DIR="/usr/$(get_libdir)" \
+		PREFIX="/usr"
+}
+
+src_install() {
+	mkdir -p "${ED}/${DOC_DIR}" || die
+
+	emake \
+		${myemelconf[@]} \
+		LIB_DIR="${D}/usr/$(get_libdir)" \
+		PREFIX="${D}/usr" \
+		XDG_DESKTOP_DIR="${D}/usr/share/applications" \
+		DOC_DIR="${D}/usr/share/doc/${PF}" \
+		install $(usex nls install_i18n '')
+
+	newicon icons/${PN}_48.png ${PN}.png
+
+	rm "${ED}"/usr/share/doc/${PF}/LGPL || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
index 6bfce9b0d14d..4bf0e089ad76 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1,5 +1,3 @@
-DIST evemu-2.6.0.tar.xz 507032 BLAKE2B 189507f984e2ebfdf9ff7474d5854ed02f29cd2105684700e1cc2c5ae3c1e888bebd7e8e04e3a5003506bb9571d61785712d08fd90d6e828f2ba5e2ea763a064 SHA512 8dd3be18abc6e36a79b91e6099116048e4fd45a96531a5c2773c84618d6ba7089ee8734b51b9309462c393dc7c3a83d87438bcbdcd5876803165a4ea439aff83
 DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
-EBUILD evemu-2.6.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
 EBUILD evemu-2.7.0.ebuild 1025 BLAKE2B 87376eb6d0054d4388b5a14dabd889bf45e8229442440fa3afeb25628a7a09ba2b565c0d5b08a2ad5ba27d5ee69fd8603668fa72794bdb31efed3cd709fd3bf6 SHA512 fac7eb84ca96af58db527d6b9c99b764caf2e76ba59480c755f3a17ba4630bc3cb44a5f8f4cca23416f31ff3e45bb0b48b4d1117756f5d23bef5ad81ea9536d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/evemu/evemu-2.6.0.ebuild b/app-misc/evemu/evemu-2.6.0.ebuild
deleted file mode 100644
index 8ac8d69567ec..000000000000
--- a/app-misc/evemu/evemu-2.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
-HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/libevdev-1.2.99.902"
-DEPEND="app-arch/xz-utils
-	${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable python python-bindings)
-}
-
-src_test() {
-	if use python ; then
-		if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
-			ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
-		else
-			emake check
-		fi
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index bc5ed161676f..846d8f816867 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 578 BLAKE2B edf2cd60d843f8bc9f928ba19a42c84343a18f58f9c9f2416b52fd64ce1f8dbd66e4e78dc7b76b4e45d1c7e403e2dae6e7b61860dbd29885ac3dc8ffc7cf42cc SHA512 b81257778c552857f5a629f6b4fef685ea1ca1ce945892c17dd0b14248f10bd30d0a89fee238670498d3c681725ded427bfa1af71ab3c5831f2f9bf62114aaac
-EBUILD evtest-1.34.ebuild 580 BLAKE2B 7703882a8351524001854a8cd263802c7719151051b911348ede05db06bd6f6e4a7d61f825d35568b52a50a9f134452024a5180f237a2955b39f5d01af387685 SHA512 9920f45d76196d4674541476b64f1d6bc58f2557e007e50f8c32506effaf64ddc819cb6a48f9922439643793e7ab3a3ec20146b448310cc8329696a94f6f4dd8
+EBUILD evtest-1.34.ebuild 587 BLAKE2B fdffcba9a525c368d1d725cc71b3f0c68a56fbf2c006526a974f8e8b2ee28b197644164e1b0d50b2b7937fbf5ffc7d118a3b561c18b3a997a129552f5c8d69d2 SHA512 9a718b7f4cdee7addfa68b8c3cd10f41c5f264b4235f80e76184fa10119d5091ffd6a33896f5039abe2e9df8c0d4931495db69d2d4b2a49d87991307f4f3c025
 MISC metadata.xml 241 BLAKE2B 25bcd095e850e5d5b0eb543070c829aa274b10aa3c44b1e21b5101a57f2cb66585a033aa9f93a8d4f278daa208b3ced7cd2d4f726cfb43cbe2e141c7915ba1c2 SHA512 7f368e04c0170689ed48a96f0a5dfade1ad0503dbf28eef73067d9c5181e760d94bd36c4f5558cab4bf244b25aa9d2311bef409d02ba4d186d83353552ec1a75
diff --git a/app-misc/evtest/evtest-1.34.ebuild b/app-misc/evtest/evtest-1.34.ebuild
index 7bb2f5d466ee..a78f06daa8ee 100644
--- a/app-misc/evtest/evtest-1.34.ebuild
+++ b/app-misc/evtest/evtest-1.34.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index d6a3cbf2fc85..c62c79805cfa 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,6 +1,7 @@
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 943 BLAKE2B 9b276954a7ed1fa392d2d7ec13cc822bab67d289884cfbf170a4ed0a98fa166fee19c6221a683b02c57ec11caea41821487c0b89b5f1804a4fc56eb5f5a5c4cf SHA512 4d6075b0a369bba1e95074fde136be5edd9eb01aa6906ee4385e08b73311315c80c5d24f467bb0783084f12097e4a1ca8be65b183bdb66752ed62642e7d3a104
+EBUILD figlet-2.2.5-r1.ebuild 937 BLAKE2B 24ee90a610c28ed3fec048256774012785eda68cd4dfcc0d681d80799ff88b9a9bcd0948828f0be20a74e6bd115ec44ac9de78742397b5f9515a05717347a043 SHA512 55c09a2aa1e8c7a8449f53be03e98e709144224d68554e76b783f394cd0105f9c90be3b6c17a6287033a7ac379816a7fb32aa738c613db664c5425a3e9f04c30
 EBUILD figlet-2.2.5.ebuild 934 BLAKE2B e5479f3a0e0a066e17cf129646c2c42b3f74b86abece508563c4c49d5ee854a081d3ac5d2e569a01623f5a3939a27df0881c1328df8225d6b6d2b4fd79416e37 SHA512 1c3a768808eb9ad13ae8b107a3e91fdeb4ae0fc8af4472bd7fb29ae7d017d678cf5798e21c2f2807ffb610fc361d1b3cefceefdda4dc9bc05ddd5bdff19ff222
+EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 953d8c4cb93e..f78f205dab99 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.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=6
@@ -16,17 +16,17 @@ src_compile() {
 	emake clean
 	emake \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-	    LDFLAGS="${LDFLAGS}" \
+		LD="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
 		all
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
 		BINDIR="${EPREFIX}/usr/bin" \
+		DESTDIR="${D}" \
 		MANDIR="${EPREFIX}/usr/share/man" \
 		prefix="${EPREFIX}/usr" \
 		install
diff --git a/app-misc/figlet/figlet-9999.ebuild b/app-misc/figlet/figlet-9999.ebuild
new file mode 100644
index 000000000000..30e2a9d7e973
--- /dev/null
+++ b/app-misc/figlet/figlet-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 git-r3 toolchain-funcs
+
+DESCRIPTION="program for making large letters out of ordinary text"
+HOMEPAGE="http://www.figlet.org/"
+EGIT_REPO_URI="https://github.com/cmatsuoka/figlet"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+src_compile() {
+	emake clean
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LD="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		all
+}
+
+src_install() {
+	emake \
+		BINDIR="${EPREFIX}/usr/bin" \
+		DESTDIR="${D}" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
+	dodoc README figfont.txt
+
+	newbashcomp "${FILESDIR}"/figlet.bashcomp-r1 figlet
+}
diff --git a/app-misc/fr24feed/Manifest b/app-misc/fr24feed/Manifest
index f9552f70e45d..fde185a42eaa 100644
--- a/app-misc/fr24feed/Manifest
+++ b/app-misc/fr24feed/Manifest
@@ -3,5 +3,8 @@ AUX fr24feed.ini 15 BLAKE2B bb6e818c0ee430ca84bbc59688a6087fa50095521d7c7e8cd799
 AUX fr24feed.initd 618 BLAKE2B 5e7a6cf2160be2cce8f5779b2fd6613a2cc4d8e754a8538cf5d6ff39e434ed97b5763ec76ed97a1cfd1e36e3d9884b63604e770368668cfa1ad9f0599f08e928 SHA512 8bc686237a15206569aea00a68e3f6bbf97036915c23781a122831b43ac3045e12b440f565d862b25ff3b453fc17cd32a026cafc7e4409aca6dfef0514901528
 DIST fr24feed_1.0.24-5_amd64.tgz 3943670 BLAKE2B d8d7b031872c1220f2f6ba5843d0c457279d393ae78dc947fe5cbc81e5ee1d4bf629ecddee093020ed3e01937fcecd9f225dcfd5c55fc47e7a31a23007122a18 SHA512 9ed5391e7faf1ab3352b95d6eaab8cccd77f0759e4852c3e0283a930d8f7dff2f38c59eb00639a2be0c6decd9f4db49fcdefb6b3de3533b8453a02f66224d503
 DIST fr24feed_1.0.24-5_i386.tgz 3645172 BLAKE2B 074d6535d09ab77baa9d954bcd9c87c3099b6938ad57ab67f16b14a6a8f865868eb3d82b49eeb6559a6929f8cb28f3591563f007490dd45782b4452cf2da12f2 SHA512 05d9a7ad64e047d3b2934d6421d1fcfb8aa6eb955739f9fa58726d2e45cb7141fad73ea1943ce01a071077a8155e07672acade75ce9068d5c932b0b24ff2b194
+DIST fr24feed_1.0.25-3_amd64.tgz 4036311 BLAKE2B 9212bad79534e989aa7d12ff3f283c328603cad79cd7908c526bd1170cbf00b8c41e2effa6db703e1f967113042fd439e15c39c2b8a4de8a58e5819afa273718 SHA512 6d0e687dd8d9a104de0db003764db3771003e516bc48e1aa2f39fce7db80f01f5e14b318063f29122706f769d6c0db24b811b386e9c2e9e48e45e59b03bcd0ef
+DIST fr24feed_1.0.25-3_i386.tgz 3746108 BLAKE2B 3ccd586441c3441e3cec5723bd9de1723ec0fa7d5ab3cf04805661dc303d3ab670b084fcd6198574573511395162b86432bcf026c000ae280018bc831ec2c548 SHA512 22a10cb097c507c15e8aff20bf453d1c96459b0b0538009970fce0abbead0f0a1397c2af0d1c1e1040f247019f1eeaa80e5760c93e26500fe189f66861c20a72
 EBUILD fr24feed-1.0.24_p5.ebuild 979 BLAKE2B ec3090882bc5f9af684826856a94c90d634676c587a893e579c6cc0763676846cdd49754292575edb525ffc420faab0f18fa3ede14d5e34778dc7799bd072332 SHA512 d9cecd78456987747bfcdf4191d7f3fa9afa8d1afd0dfea678cbbd0adb5d7bc34d6a0e72ab289c9bf03d7fa606ad9b4470457583c366da4416b3ed4ad6404f14
+EBUILD fr24feed-1.0.25_p3.ebuild 981 BLAKE2B 5521a42195d048f8149ac44dae6d01bec44f7889a1d9351391a1590d4d9f7205ff63a19a1f55cc521c00c0fb74ea396d603aca5e81d8fa537ebc0700d7e308a4 SHA512 e37a85a4b2a46eb85b775d840304555779f76f2bdb4f635f85809649e12d9eaca09e23b8a8418691eeaa63109abf7612da762f8276b4367a362be7256906d39c
 MISC metadata.xml 891 BLAKE2B 7f5e04b5c9a20ce764f8440658b14d3f125f92e90c57188456cfed899aa1b13086edbb322aa71dcae9d28a92c4044a7d7043304bd21646090fcc761f4b8c9583 SHA512 fb6aac498a44f91af213696ca370eb63f0fd19e221f53de9b1e16563f9bea2d8c32ed1f8aafe395dc606fcf1a406156f184f50529d5645bc40be507d831b5414
diff --git a/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild b/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
new file mode 100644
index 000000000000..5ee8e9041b3f
--- /dev/null
+++ b/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/-/_}"
+MY_PV="${MY_PV/_p/-}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="Flightradar24 data sharing software"
+HOMEPAGE="https://www.flightradar24.com/share-your-data"
+SRC_URI="
+	amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/${MY_P}_amd64.tgz )
+	x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/${MY_P}_i386.tgz )
+"
+
+LICENSE="Flightradar24"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	net-wireless/dump1090
+	virtual/libusb:1
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/bin/fr24feed"
+
+src_install() {
+	dobin fr24feed_$(usex amd64 'amd64' 'i386')/fr24feed
+
+	insinto /etc
+	doins "${FILESDIR}"/fr24feed.ini
+
+	newinitd "${FILESDIR}"/fr24feed.initd fr24feed
+	newconfd "${FILESDIR}"/fr24feed.confd fr24feed
+}
+
+pkg_postinst() {
+	elog "Please run '/usr/bin/fr24feed --signup', to register yourself as a data feeder."
+}
diff --git a/app-misc/freewvs/Manifest b/app-misc/freewvs/Manifest
new file mode 100644
index 000000000000..aee6bcdf64bb
--- /dev/null
+++ b/app-misc/freewvs/Manifest
@@ -0,0 +1,3 @@
+DIST freewvs-0.1.1.tar.gz 20518 BLAKE2B d3ced38b16a7bce4cf4907de30c1525132d8ee92ad531e5439c9033bce05a69c76688ec10c759d3f46462e0804845c0bd90eb5bb5d457b28ca00dcd380a85e3c SHA512 cc48dfd5f381a88bbd89f3ad4e08fb389b9ccfd7461539ea51f21bd2d9863537b68037de34c90b8c97f24a7bb2d05cfe12efda3f308c19a0a20cf5d7c5046cdd
+EBUILD freewvs-0.1.1.ebuild 622 BLAKE2B 85257e95364e4fadda686b7025057d7163a5838b1f8776634cdbbe33ba4eef876171416fc6836bc151cf79b7545cb65e654fe9252993ff2cd9fe77b04584d2c5 SHA512 cdc521dcd9469757dcf37334f629d252057ee61170dd942857baaa2603d91f9ed70d7a007cf69a0ad287521445bc731ae154ea078174e72ae685f4c9fc95a637
+MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-misc/freewvs/freewvs-0.1.1.ebuild b/app-misc/freewvs/freewvs-0.1.1.ebuild
new file mode 100644
index 000000000000..7123086b02cc
--- /dev/null
+++ b/app-misc/freewvs/freewvs-0.1.1.ebuild
@@ -0,0 +1,24 @@
+# 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_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Scans filesystem for known vulnerable web applications"
+HOMEPAGE="https://freewvs.schokokeks.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.md )
+
+pkg_postinst() {
+	einfo To use freewvs you need to run
+	einfo   update-freewvsdb
+	einfo first. You should run this on a regular basis to update
+	einfo the web application data, e.g. via a cronjob.
+}
diff --git a/app-misc/webcomics-collector/metadata.xml b/app-misc/freewvs/metadata.xml
index 6f49eba8f496..28ef3c7b080f 100644
--- a/app-misc/webcomics-collector/metadata.xml
+++ b/app-misc/freewvs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 1a97f5744a9f..0ddfd3d380d9 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
-DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
-EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
+DIST gnote-3.36.2.tar.xz 3511244 BLAKE2B d7b8859ec47f8da2d37f285141d4c7fc0f591751a1ebea70339d6cdb727c74a6ca711515f8169130e1b46c1653c0c98da3bc4bce691b8d7a7f2794745e8db2a7 SHA512 6d2e32954836b4ac2800071385eedd6ad391936ee52626b7d51b077e4b4a3e071149804281e645b0fd88dc18e9f3c0f8d53e0994d33875ce5375d6b50b14d5e1
 EBUILD gnote-3.36.1.ebuild 1546 BLAKE2B 4ce85d4d9ff99dd114b5bec5643d9c438ba77a563c8c878aa72d1fe2e789163960d18910d09273f11861561175d215fb128613d3dfceb192aedeaf16f2406fda SHA512 ef696ad04560cb4d27a7446e19f3d04c9fb8877a227e77c1f7dfc3c47aa2f276db6b7b095dbb484f94911a13a379f41bb298f090c7efb65ad400e2eef6895528
+EBUILD gnote-3.36.2.ebuild 1548 BLAKE2B 6edd95f88dc91cb497d0c381d70ff6372ecdbfb576fea1b52225ccefe7e6ef1eecf1ff35fa2131c1778679c119a82121488f3f9777e8a01176324ffc4e9c01a5 SHA512 9a3d035a3eec9d4b03f3209cde5d15eb0ba39c882213999972eac931301d5a64f053c3927d79d293461047ad8ba6c4b5a7eff1665aa546c4ff3a847caaca76ab
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.30.0.ebuild b/app-misc/gnote/gnote-3.36.2.ebuild
index a1955b0552a3..95d5527ca525 100644
--- a/app-misc/gnote/gnote-3.30.0.ebuild
+++ b/app-misc/gnote/gnote-3.36.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=6
@@ -11,17 +11,16 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 # Automagic:
 # glib-2.32 dep
 # >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-# glibmm: first version in tree providing Thread API fix
 COMMON_DEPEND="
 	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.52.1-r1:2
+	>=app-text/gspell-1.6.0:=
+	>=dev-cpp/glibmm-2.62.0:2
 	>=dev-cpp/gtkmm-3.18:3.0
 	>=dev-libs/glib-2.32:2[dbus]
 	>=dev-libs/libxml2-2:2
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
index a00c9e14a994..bcadd7d1b9a8 100644
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@@ -1,3 +1,3 @@
-DIST gnutu-2.5.tar.gz 287100 BLAKE2B 1e5c140e33097643dac12c1018468f34946d232237a35d16993a6750a04e71b9a1d5eff4e0e8388de7f22d98cec173107ebdfe276cff5d2969bfd45dbcfac584 SHA512 b3ce4a39ca06cdb18459b64ca0ee167a735ae01dcac155c606d4ee61ace4d128540aa60f5ca2c0a5ed9ed561a7b1ebe02cd1dd4cffe79c3f0cbb8af831fdcd82
-EBUILD gnutu-2.5-r1.ebuild 428 BLAKE2B a0b098383bfc8b3e0252d8cf3af352b7df77b99aca509384c8d547556658191edf50a08eed991ca646c1dbc80bd4edb38e149a6c1f015e8293b942299352ad2b SHA512 9c47c78124e7e1588ece414a94fe671887363b9420be44e895c875e472f05a5022c8b164944d42bbdb306063f79717bc092acfe153741d768cfa15993a7c9ad4
-MISC metadata.xml 873 BLAKE2B c317e6972dd81efa9ceebc224f089b9661c77be69894f0062f5e7e93cb5e17967ac683bba1c47332ec6448b6ae05d6db6835d25d3252e631dd893254307e1907 SHA512 c8954a8cd9ba16d5bb61e47ec33eec0c8631ebcffb01e324ddb2fd3cb7de1bf8c989d7a8e209449e99af1e72cd0aa86881ac6f22a63a5b3a63801cd22e15547b
+DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
+EBUILD gnutu-2.9.ebuild 617 BLAKE2B 8888b504b4db24d36f7d366a7d1dc3efcdd9284f178ef99c679b3f5e015999a3fe886f29730020d109c1c38743c9c6800896e1f3675631a5447e8795ee7fa17e SHA512 59769a6f4eee6baa0eb7deb6187d1e33e0be41659767e340d7273a0ad8ce97b2d1d75f8962f73d43a25ba67fda81444ca68b080977193da66fc05011a678a543
+MISC metadata.xml 1074 BLAKE2B 6c0522bee38564ad715c44022803d11f1999c5774ff07aac9ee42259a1bda24c024bc0f83e4c329dbb4d3d9e380aee4df61af9ec41dcd17064a3879d7b4aa3c9 SHA512 4e9df2df20f654d87bf9b6a6be9d873129878f610a25f08446135f8fc7ac74ecb35d7cef3de0aa06cd2b19768fd5bcd9d399d781de11533c8064d5cc61a2f0d5
diff --git a/app-misc/gnutu/gnutu-2.5-r1.ebuild b/app-misc/gnutu/gnutu-2.5-r1.ebuild
deleted file mode 100644
index 15ea1c63c534..000000000000
--- a/app-misc/gnutu/gnutu-2.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GNU Student's Timetable for polish users"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/mono-1.2.5.1-r1
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/app-misc/gnutu/gnutu-2.9.ebuild b/app-misc/gnutu/gnutu-2.9.ebuild
new file mode 100644
index 000000000000..5ff9f4bd17b3
--- /dev/null
+++ b/app-misc/gnutu/gnutu-2.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU Student's Timetable for polish users"
+HOMEPAGE="https://sourceforge.net/projects/gnutu/"
+SRC_URI="https://master.dl.sourceforge.net/project/gnutu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/mono-1.2.5.1-r1
+	>=dev-dotnet/gtk-sharp-2.12.21
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	# Remove deprecated Application tag from .desktop file
+	sed -i 's/\;Application//g' gnutu.desktop.cs || die "Sed failed"
+	default
+}
diff --git a/app-misc/gnutu/metadata.xml b/app-misc/gnutu/metadata.xml
index 3fa328ef2ad6..29a4b57b7210 100644
--- a/app-misc/gnutu/metadata.xml
+++ b/app-misc/gnutu/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		GNUTU is a polish program. It is designed for students from primary and
 		secondary schools – using it, you can note various information (like marks,
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 72af4ab7336d..d92fcccfa630 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -3,7 +3,7 @@ AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181f
 AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
 AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
-EBUILD golly-3.3-r2.ebuild 1352 BLAKE2B 890bee53df3849f02d929b52a1947271d0e67991c0a2a4e8e4ba0b166d4139edbe36117f0e9b0092eae32a5c79fe5b5bb7cc47c5244a1bb8254e5fe6a579dd3a SHA512 6e5853d8a28373452f7c35104bbc3348ba2876642363ec041e38195b0672206f3da62af10eed4505dda15fe92157cf4d8b3c2656158650f487a4b805423bb5df
-EBUILD golly-3.3-r3.ebuild 1357 BLAKE2B b54590a3c3a6102149a4981b091a4369999ee93980fca1ea2d21e5ade7edb2762db935c542734493e1e21fca30594617c0985e8b1cf6bcda917c2baaf4baa9d2 SHA512 9b970c06e4fa0bdcb65de218bf4c4778e63ab2dfa4dd7efaa923063a64daf42c580c0984cb68e451cfc0672b5439d2d8943feabdc00d7c0e0c49d1f2a9fb007c
+DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
+EBUILD golly-3.3-r3.ebuild 1349 BLAKE2B 3ecc2e4808a8ff7831dd868403df970dc599f2e8330819507b3ec5e8bdbeefd186af96d1932104276f7a9b4d58caf2248b6d0b140f11035fc70ac85fd297e725 SHA512 c86877d3f72acd958888e68ff5c263ea3d503f101769542bb4b7a741aee68fa2412524599c5dcd528deff0e79788731ca1041def490283007c7690568b512b35
+EBUILD golly-3.4.ebuild 1371 BLAKE2B 15dcc3839e2d8cea284b55df93f86a2bc9c3e332cf42811ac7d17202567625cd8acdeadd725a2836c36082a56305ed601c3fc46e432794d32773cc16bff0f5b3 SHA512 06440ac25965dd04571c8c87c816ae63d6228fe792acf34048198b261ead92fff6dbc477b929795eb7a6ebdceecaa9ba5e527d5f239d1ad4d0dbcda6e63ba71f
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
deleted file mode 100644
index 26742c324c99..000000000000
--- a/app-misc/golly/golly-3.3-r1.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/golly/golly-3.3-r3.ebuild b/app-misc/golly/golly-3.3-r3.ebuild
index 10240aa63d7d..8e1fd8ca0964 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools desktop python-single-r1 wxwidgets xdg-utils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/golly/golly-3.3-r2.ebuild b/app-misc/golly/golly-3.4.ebuild
index e3a3e4a7e591..33eaee6f7422 100644
--- a/app-misc/golly/golly-3.3-r2.ebuild
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools desktop python-single-r1 wxwidgets xdg-utils
 
@@ -29,10 +29,10 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${P}-src
 
 PATCHES=(
-	"${FILESDIR}"/${P}-nondynamic-python.patch
-	"${FILESDIR}"/${P}-allow-py23-exec.patch
-	"${FILESDIR}"/${P}-glife-py23.patch
-	"${FILESDIR}"/${P}-allow-py3.patch
+	"${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
+	"${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
+	"${FILESDIR}"/${PN}-3.3-glife-py23.patch
+	"${FILESDIR}"/${PN}-3.3-allow-py3.patch
 )
 
 pkg_setup() {
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 2923564d0f85..080876e2bef2 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,5 @@
 DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
-EBUILD gramps-5.1.2-r1.ebuild 2323 BLAKE2B b237c48264b0a5c6f539571b266b79c1927d38b7732a3b0629422d170a5b04d2f53117accc943ee488d5ae3302c09f003a8c48be3d1615df7e1ad01835a0f7b2 SHA512 3ae328cc32a25f906ef43cd792b668b92a18c4395c5b1ed60d90b0b535142c3edf0b27f69f47e5b90910c49d4b874c84211fea4d7bf296c48b8d8f6b01f6f5d0
+DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
+EBUILD gramps-5.1.2-r1.ebuild 2323 BLAKE2B 74a8c0694baa94bcb9e902e1f84b534623cf3638f1d4b2dc49d9519d790452f8894f32692d95bf4c123717a4064e190889ddda17823f0d9e4db0a2b99714d984 SHA512 9a66ca305bbfbd492df3392c666a99b1ae5577f7bca37301cbffacf6f94baf40712c76432fcf81bc755a43b8886749ac53dd2580779cf3714e7d44f4964a0793
+EBUILD gramps-5.1.3.ebuild 2744 BLAKE2B 85f9935ff698fa766d7c57795ac0e6f750cf5ac72169dbc831da91f248df9f7e4d67cd9477197727745a63e94b3ca7c35af9c73d2fbdc3fed2ec1bdec672cde5 SHA512 cf06cf91b24013d7c2107351fbdf2912b14f71dd34d818ef3a1d652e8c15b8dcf0ce8d248ca868b3217b4256b25c062bb6fff37f5caf9e863e14c21bd39f5dcc
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.1.2-r1.ebuild b/app-misc/gramps/gramps-5.1.2-r1.ebuild
index 86a7c50dab9e..3cebfc2a081a 100644
--- a/app-misc/gramps/gramps-5.1.2-r1.ebuild
+++ b/app-misc/gramps/gramps-5.1.2-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 		dev-python/bsddb3[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
+		dev-python/PyICU[${PYTHON_USEDEP}]
 		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	')
 	gnome-base/librsvg:2
diff --git a/app-misc/gramps/gramps-5.1.3.ebuild b/app-misc/gramps/gramps-5.1.3.ebuild
new file mode 100644
index 000000000000..c3faf372f1cb
--- /dev/null
+++ b/app-misc/gramps/gramps-5.1.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+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 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/PyICU[${PYTHON_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_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 )
+"
+BDEPEND="test? ( ${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+)"
+
+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. FIXME: test this when a new release comes out.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	# FIXME: some of the tests fail if the locale 'en_US.UTF-8' is absent,
+	# at least as of 5.1.2 this failure does not propagate back to this
+	# function but we should still handle this properly somehow.
+	esetup.py test
+}
+
+# Ugly hack to work around Bug #717922
+python_install() {
+	local mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+		build
+	)
+	distutils-r1_python_install
+	echo -n "/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
+}
+
+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/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 0fe6496cf799..7d1169d4c2d2 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,5 @@
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
-EBUILD graphlcd-base-1.0.2.ebuild 2187 BLAKE2B 2815e92d5d4e1c97a86d8fee3cf36e41c94fbbf6bcc59e378d2f03e8205a7e524843633dc8335f78e07720512575e25d865022c48b199b12dba470d170b2d69b SHA512 2951e92b05e00f47c51e7d53122065f4a3e450f92927d657f15f57f9059b9799282990a8d534a5a6d531048935b2c37a3da99281bd01778100c72058d2107cd7
-MISC metadata.xml 1117 BLAKE2B e3d013a602807ef6a36ad0975c6b31ce1f99933fd50411882095595df5913077e257e08d019060216df048c6b01d38c296725efa329aaba7a376e1102aba458a SHA512 9bf31404b8812b414871f45d9312b6e2dfd492ef4ff3de0230d1eec731b93875729d76fb0e2a06f383aa88d8921f03fbf2e4a054e7ac794722eae32bcd99b747
+DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
+EBUILD graphlcd-base-1.0.2-r1.ebuild 2214 BLAKE2B 9ad78dfc2f604d56584924debf66a9fc3d2dd0aa69f1973afc9904e305872cb00debcf7f8f727719b0199374d459f171f778b502a8fc7c0a4e4a0fb24fa7ece4 SHA512 72af5113f2132a857ee53a17a129cbcc2508e5932caff3f5d6461fe529162ecb7ab269b134afb58d1f8b7187a0d451f2e6825774c84264cd671e15c1d136d6e4
+EBUILD graphlcd-base-2.0.0.ebuild 2203 BLAKE2B a4cc16b6ca862c9d7ce465a8cd8ebc703934394b66911d1f986d98fcee8bb21ebe0d1abc0dd1c833e0da34c8de32013f18b4d3bf7f07bf0b90df43ae533da50e SHA512 784bc5fb63bae7b310ff7f32e6a4e67485508b6640f42dfd4939e9ed43f1a6e4d0ee0f0be02d46cf82b82deca709e646680a15ebdcbaa228485ad68eecabd1a5
+MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
index 9aa1ba4ab64d..d865aa64e510 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 
 RDEPEND="
@@ -73,9 +73,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
 
-	udev_dorules 99-graphlcd-base.rules
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
new file mode 100644
index 000000000000..ddb8aac8b96d
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs udev
+
+DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
+
+RDEPEND="
+	dev-libs/libhid
+	net-libs/libvncserver
+	freetype? ( media-libs/freetype:2= )
+	fontconfig? ( media-libs/fontconfig:1.0= )
+	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
+	imagemagick? ( <media-gfx/imagemagick-7 )
+	lcd_devices_ax206dpf? ( virtual/libusb:0 )
+	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "HISTORY" "README" "TODO" "docs/." )
+
+src_prepare() {
+	default
+
+	# Change '/usr/local/' to '/usr'
+	# Change '/usr/lib' to '/usr/$(get_libdir)'
+	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
+
+	# Fix newer GCC version with the Futaba MDM166A lcd driver
+	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
+
+	tc-export CC CXX
+}
+
+src_configure() {
+	# Build optional drivers
+	if use lcd_devices_ax206dpf; then
+		sed -e "78s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_picolcd_256x64; then
+		sed -e "81s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_vnc; then
+		sed -e "72s:1:0:" -i Make.config || die
+	fi
+
+	# Build optional features
+	if ! use freetype; then
+		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if ! use fontconfig; then
+		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if use graphicsmagick; then
+		sed -e "69s:#::" -i Make.config || die
+	fi
+	if use imagemagick; then
+		sed -e "68s:#::" -i Make.config || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+
+	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index 3e6de0049c66..3f12c9e81353 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -20,7 +20,6 @@
 	<use>
 		<flag name="fontconfig">Add support for <pkg>media-libs/fontconfig</pkg> font names.</flag>
 		<flag name="freetype">Add support for <pkg>media-libs/freetype</pkg>.</flag>
-		<flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg>, used by the Logitech G15 keyboard.</flag>
 		<flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg>.</flag>
 		<flag name="imagemagick">Add support for <pkg>media-gfx/imagemagick</pkg>.</flag>
 	</use>
diff --git a/app-misc/gtk-sunlight/Manifest b/app-misc/gtk-sunlight/Manifest
index a3761c0c967b..286cbf2c4434 100644
--- a/app-misc/gtk-sunlight/Manifest
+++ b/app-misc/gtk-sunlight/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-sunlight_0.4.2.orig.tar.gz 562581 BLAKE2B 6fd80fd0324de2e7fbe5cf72eddecee128abe4d4d4cb13c30c224241f1fb99a8683bce43f2b60dc309ac9479f424bd31db5a5c2c659a36da0266b3fc58cd687c SHA512 6490172beeb4c3566a42de858e321cdf83be6852d5c290f75f41d22855d002e8609948164cb757e787a1123a4fe47b69272996ffc821c057b7c6ce8b0b180083
-EBUILD gtk-sunlight-0.4.2.ebuild 561 BLAKE2B c52c7f3c048717138b6c815d16be2a6329ace22a53d6a71468bf6847e5f15b64d0c9f93c44edfc1f7ae50ee18cabb810a98a37b8daf26660aeee5a08d9cff92f SHA512 22429b40240fcb211927e87408c5335a0731e5381c472d68ca3528113c3d121feae7c456b1419cf3479a99b407461df7eb30d6a67f2ad6eb423155b6bea116f9
+EBUILD gtk-sunlight-0.4.2.ebuild 559 BLAKE2B 750d438eccb58dcc04d89c6553ae13c815279d5ae3c9ae5e4f1ab55618edd6919b134341a5725710a4f0b74454894efcb9f3a5189fa85a6e3a149c6f3b8dbf69 SHA512 edcd618616c2c1595439a8736b4974685656d4de258d447bb4ca1543a603c19c2d496ebdf2bf839dbc691a097c84700c8e6c05951b96a93ce74a9ea5758fa9ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
index cc518cf235df..5cc337b88d9f 100644
--- a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
+++ b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="dev-libs/glib:2
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3"
-DEPEND="${REPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_compile() {
diff --git a/app-misc/ifp-line/Manifest b/app-misc/ifp-line/Manifest
deleted file mode 100644
index c8723a2f8599..000000000000
--- a/app-misc/ifp-line/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ifp-line-0.3-fix-warnings.patch 1080 BLAKE2B 72e77b8d09dd077d399275ab5f46365be07278208281629416ccff43667c86d709b814c32163161c0e1e5bd4b5bf3dce76306b34a98e874ccb850065a3b83d3c SHA512 348fea237990df0531c32f688f888af2f247a318c711582d5a113531f1e28380c5b62d79947751c7f1180360459a883cd1e505f8e9ac04869fa68392d3a2b400
-DIST ifp-line-0.3.tar.gz 138272 BLAKE2B 249476938d111cc7609069f448b248921211cf298415951f4ea5043a8eff0eb80d11aeb1dab3d5d9db1aeed82b0de205d79945d4b0379762b62bc979485eb95e SHA512 516ad85fdaf69111581b013b2517c7083656436d429a86ec5ca4b7dcaf1c841538f98138cce8839d990a34550f11cc6bc9dedc701b0123b9cb73a91a7d78694d
-EBUILD ifp-line-0.3.ebuild 763 BLAKE2B e9ca62915884c2577e13cee495df691203a5a04bb1d5b733483fbce5f538c4309dbacfcd570e0f0390f48adfabfff6531937d704b65488e0fbe8c9dc475d228b SHA512 55bbf8a50397f3baf870e5a7b93e7ff73cd03c67479f9230e3831b17cdae60eafbce6e60d3c1dc9aaf9b0b71c0c50d9cf0be5b14536157d53207342c9e6390cd
-MISC metadata.xml 333 BLAKE2B 87a4530824fff1355c5d2af1b6483b6fb1752c5a346b5848500b7962307a2e9956727f08e753b1548fbd941352a4563e9c14ae386bd46f238f8929cc2d46970b SHA512 d0cd8f6fc7bdc757d2a1ef5443f30410514ac335bcd2a84829995c527862b994fc75a8dfc5ceff2b8e2a3d7b0b081a57cbc50e4b825567b8a56d0f9eb00c13c7
diff --git a/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch b/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
deleted file mode 100644
index a3bf5c24b95d..000000000000
--- a/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/unicodehack.c	2006-01-31 20:18:16.000000000 -0500
-+++ b/unicodehack.c	2006-01-31 20:18:39.000000000 -0500
-@@ -26,7 +26,7 @@
- 	return -1;
-     }
- 
--    if ( (retval = iconv(cd, (const char **)&src, &srcln, &dst, &dstln)) == -1) {
-+    if ( (retval = iconv(cd, (char **)&src, &srcln, &dst, &dstln)) == -1) {
- 	// XXX ignore error message "iconv: Illiegal byte sequence"
- 	// with GNU libiconv.  No effect for output in now.
- 	//perror("iconv");
-@@ -43,7 +43,7 @@
- /**
-  * @return less then zero: error.
-  */
--int unicode2locale(char *dst, size_t dstln, const char *src, size_t srcln) {
-+int unicode2locale(char *dst, size_t dstln, char *src, size_t srcln) {
-     iconv_t cd;
-     int retval;
- 
---- a/unicodehack.h	2006-01-31 20:19:05.000000000 -0500
-+++ b/unicodehack.h	2006-01-31 20:19:26.000000000 -0500
-@@ -4,6 +4,6 @@
- #define IFPLINE_UNICODEHACK_H
- 
- extern int locale2unicode(char*, size_t, const char*, size_t);
--extern int unicode2locale(char*, size_t, const char*, size_t);
-+extern int unicode2locale(char*, size_t, char*, size_t);
- 
- #endif	// IFPLINE_UNICODEHACK_H
diff --git a/app-misc/ifp-line/ifp-line-0.3.ebuild b/app-misc/ifp-line/ifp-line-0.3.ebuild
deleted file mode 100644
index c77ec2937f0f..000000000000
--- a/app-misc/ifp-line/ifp-line-0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="iRiver iFP open-source driver"
-HOMEPAGE="http://ifp-driver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ifp-driver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" )
-
-src_install() {
-	dobin ifp
-	doman ifp.1
-
-	exeinto /usr/share/${PN}
-	doexe nonroot.sh
-	default
-}
-
-pkg_postinst() {
-	elog
-	elog "To enable non-root usage of ${PN}, you use any of the following"
-	elog "methods."
-	elog
-	elog " 1. Follow the TIPS file in"
-	elog "      /usr/share/doc/${PF}"
-	elog
-	elog " 2. Run /usr/share/${PN}/nonroot.sh"
-	elog
-}
diff --git a/app-misc/ifp-line/metadata.xml b/app-misc/ifp-line/metadata.xml
deleted file mode 100644
index 81812cad1e5b..000000000000
--- a/app-misc/ifp-line/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ifp-driver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 7f0411563fc5..6443076d903d 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,3 @@
 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 1276 BLAKE2B bd0128fd4434a44f0e0a33fe31ab7e4df0240b276577a22b6d45d1fe576f9e4e5e5f079d7853530d2cec8d70e8c24e980fd8808e2a5e4604a3bcdfcdca96e692 SHA512 9b0b1762fdc4a40432bb3a0109864126bb729909861dec92f52d9cd6871c4ae132ebddd3e824c5ddfac5f1275995659c1033baddbf56f5572961f03f50cb4a78
-EBUILD khal-0.9.10.ebuild 1216 BLAKE2B 368d898fdab658268309d486dbf00e081fb52ddcb78224b43c710526e34faec98e3ae92bdf049b240dec6207496e82ce742d3f5dcaaf284916a10fb066451be7 SHA512 9f71b2c9eb0557be1fd20fc1215bf6300a6a30ff0c7beb48fba84e66079ce3f4fda9fb8965d7ac1afb409f56d0fbbe3f154d2f5d2774014ade5370e4bc4313ed
+EBUILD khal-0.10.1-r1.ebuild 1278 BLAKE2B f88037dcccd4f5bf878687f42a96459b84d4c1e57b3b2e797542db99cafc14efa9c65d08bfad762a450b53d2338087138ed64dc440b1d155a0057d028b7e8dbc SHA512 6e6156925243a298f179b0bd3d9815d7c869fc837ba7c1e26cabb0e4911c8a469e32ece04338c2bf5366da98991ba650938477552492947e04739b74a7608d1b
 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 094279f9a340..6ef78da963d9 100644
--- a/app-misc/khal/khal-0.10.1-r1.ebuild
+++ b/app-misc/khal/khal-0.10.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.10.ebuild b/app-misc/khal/khal-0.9.10.ebuild
deleted file mode 100644
index ab611970184e..000000000000
--- a/app-misc/khal/khal-0.9.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index e10be4f41fe1..290024119b93 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,7 +1,3 @@
-DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
-DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
-EBUILD khard-0.11.4.ebuild 1047 BLAKE2B 5a49a1924187a58ea0bf40b424d401ee0baae588df144cc5e108861f96de4cf46589a8c99ed52df38ec8c73060f8f23bfa46ee082aad7bf77df4b72d0211f025 SHA512 4eb9eab539505f09a209f0e85ee00f0279ef8ede395932db733e9edd1f647d271594c3a96add9a5879b399ab0201a4b763294ac5d757016dd75b373ced314583
-EBUILD khard-0.12.2.ebuild 1088 BLAKE2B 302dfb8248572c15237119721c0fab8ce08aea7932f60df758c4ea60d204a1e18e506362bd5ac986cb768a1fb99dc1ac230939d4ec266e1693c51c43f155f657 SHA512 bc1b6f651bdaa91d218744c8e36ce757cb3f0411e58b7bbbf625bf486d55d85f73bed6ced12357b3d6d0561d84fcbee60f6952cd73c8d1856b19b9971499cdc8
-EBUILD khard-0.13.0.ebuild 1193 BLAKE2B 226590ecf10851053f081775381fb60052e0de8f0dbb9c6d31652ebc2e64400b3bb976d0b84e37d7d27c27f2edfd1e7336154667fc4b92e6da9b38f569fa238d SHA512 cf660d793764431e3ad8929f6112a86a3c6a721e16049109c2ea4244933889c98e1b691f654e0f00e62073fb1aa9294378e6bc6487aaed0e869eb78be0fd1096
+EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
deleted file mode 100644
index f2d17514103f..000000000000
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="zsh-completion"
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
-"
-# vobject-0.9.3 breaks khard, see
-# https://github.com/scheibler/khard/issues/87
-# https://github.com/eventable/vobject/issues/39
-
-DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
deleted file mode 100644
index c66bad5ddb82..000000000000
--- a/app-misc/khard/khard-0.12.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="zsh-completion"
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
-"
-# vobject-0.9.3 breaks khard, see
-# https://github.com/scheibler/khard/issues/87
-# https://github.com/eventable/vobject/issues/39
-
-DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index 4cb2597381ae..7b7ff564f1b5 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -2,11 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
+
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
 LICENSE="GPL-3"
+
 SLOT="0"
 IUSE="test zsh-completion"
 RESTRICT="!test? ( test )"
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index aba011f690cb..967394c0df37 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,4 +1,6 @@
 DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
+DIST kryoflux_3.00_windows.zip 18502294 BLAKE2B f8e60b0feb6e7d7b9a43480b0b4cf67b79c5431fa20ee9e771ee7adf214e1c992d080c2eb6a043f141936f2de873d63079e994b90e994051a29391c6a308f190 SHA512 12de0c7d28b0abca2eb35748770fe96906c12940b7148103f56713fe1144e09759d362a24c094a7088713557da467b90f4e3d0ace59252cb84e3349dc73ee5bd
+EBUILD kryoflux-dtc-2.6-r1.ebuild 2455 BLAKE2B 67019b9cb6419a4a0927f8f061540294afcfddecd41e1b9a720949fefa99e61b83d5842b4d1e3d69fe1591bf974c5e1787b80d89d684160e92d292b75a69392d SHA512 e9d3c723458997b3ef1e4e5bccdca84a09d7412680438ea61ea05ca5b71113633f9be419610fa9be5cfd8d1dbe8b6496d8d96dfb42b5676c13e466920e122acb
 EBUILD kryoflux-dtc-2.6.ebuild 2411 BLAKE2B 08707c2e94ee349226b8e1fbc6c7ce4d63c73a3f12a74fb9c5da26d6af4c1c8ae3c2d88e5c71291b9a2e4ebc293760d6c4b8f650000975f5af2957fa3d480bdb SHA512 b8f561d7da48a9b80235b47c8fb04a7eb7bac506a4b7fe6ab89559ce40b8283f78121a5749fe9a3466ff11a905a8672dea8f6749874e542bdb0fb73b0e91c91e
 MISC metadata.xml 412 BLAKE2B 4a92b64039475119e84a4c9f11b1c6dac92d92139b195d37adcc710b274436a69b538d68b66393ef6f090338aa162d159929a498ba3b7d95dbcaad3b29d9204c SHA512 e8844f948a8f53b8b932311dd12c36b8148e985cb9f6927c384c131d914bd2dc42a240d45b98354a5cde3c6d6e4915c177ebed7c780c4f0b1f065571ac54ccda
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
new file mode 100644
index 000000000000..35ec7750871b
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="kryoflux_${PV}_linux"
+MY_P_WINDOWS="kryoflux_3.00_windows"
+
+inherit desktop eutils udev xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="
+	https://www.kryoflux.com/download/${MY_P}.tar.bz2
+	gui? ( https://www.kryoflux.com/download/${MY_P_WINDOWS}.zip )
+"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="SPS"
+SLOT="0"
+IUSE="demos doc fast-firmware gui static"
+
+RDEPEND="
+	dev-libs/spsdeclib
+	virtual/libusb:1
+	virtual/udev
+	gui? ( virtual/jre )
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="/usr/bin/kryoflux-dtc"
+
+src_unpack() {
+	unpack "${MY_P}".tar.bz2
+
+	if use gui; then
+		unpack "${MY_P_WINDOWS}".zip
+
+		# Extract kryoflux-ui.jar to get a logo for the meny entry
+		unpack "${MY_P_WINDOWS}"/dtc/kryoflux-ui.jar
+	fi
+}
+
+src_install() {
+	newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
+
+	cat <<-EOF > "${T}"/80-kryoflux.rules || die
+	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+	EOF
+	udev_dorules "${T}"/80-kryoflux.rules
+
+	if use gui; then
+		insinto /usr/share/kryoflux-ui
+		doins "${WORKDIR}"/"${MY_P_WINDOWS}"/dtc/kryoflux-ui.jar
+
+		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+
+		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+		newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
+
+		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+
+		dodoc dtc/kryoflux-ui_README.txt
+	fi
+
+	if use fast-firmware; then
+		insinto /lib/firmware
+		doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
+
+		dodoc dtc/firmware_fast/firmware_fast_README.txt
+	else
+		insinto /lib/firmware
+		doins dtc/firmware_kf_usb_rosalie.bin
+	fi
+
+	if use demos; then
+		dodoc -r g64_demo ipf_demo
+	fi
+
+	if use doc; then
+		dodoc -r docs schematics
+	fi
+
+	local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you want to access your Kryoflux without root access,"
+	elog "please add yourself to the floppy group."
+
+	if use fast-firmware; then
+		elog ""
+		elog "You have enabled the fast firmware. Please keep in mind,"
+		elog "that this firmware can cause trouble with older floppy drives."
+	fi
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index b4fb423baa77..20fb9d367431 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,3 +1,4 @@
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
 EBUILD ktoblzcheck-1.49-r1.ebuild 884 BLAKE2B 12fdd58f04418b90b32ea4f83aa1c652dd73f9ef64d91915a86552eef9439938413dbecb9f6545f10f97eba70e77eb6f26e572264feaed42d28dfa5a73f121d9 SHA512 1e48b63552c974266cde28b61cc87eab5820f05e8486e7918989ebfcc22c56b13f169fc99b9b58b1318e7f92ab71857b046fe67616faa3264e28bb49f8aef04b
+EBUILD ktoblzcheck-1.49-r2.ebuild 681 BLAKE2B 893109dbfdf51cdb94870f2ebeddbccec9d6c82af6d9476dc9233cc9802b21b80e311ac2870192d8ef074e7ecdf04790f3146ff10991340224ad8c9500e18627 SHA512 1bb0a2e5d3ba3fd333db09dc2b8779a8d3b46e940bce33f107f59165a49913d0e78d37efd2af92e4e79fb2a5ec0b1503204988e2269401b338df2e229c07e0d1
 MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
new file mode 100644
index 000000000000..70b76b0106e5
--- /dev/null
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to check account numbers and bank codes of German banks"
+HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/recode:0=
+	sys-apps/grep
+	sys-apps/sed
+	virtual/awk
+	|| ( net-misc/wget www-client/lynx )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf --disable-python
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 3926e6cadf8a..7f9ccd73f125 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,6 +1,5 @@
 AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.11.0_pre20170527-r4.ebuild 5561 BLAKE2B 2e2bb11514bd884f02649b6a620a9f4f92097a8d53bc04e1e9b594ea0022ee00de1facd1189c1d93b68edcb9677469c5cb6190fede0ce47eee9ec89ef199204c SHA512 8c2661960d0e099309b0f28f82c301e56accae7a85ef70edbb133fc4ad4c4be71b20b36cecb1f50a8ffcd680e8ff8f55e69ec201fa270dc9b22d08900c15606b
-EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6017 BLAKE2B a715a37f3c9125a15b6f71bf68911484ed7b79a058f8bc060d51691cd94ebf624fc7a60ed9079727c4531bc131f68679fee69cfc05b87e0b4f2852f0f2c07f2d SHA512 5d2ec4fa02fb0d2e1ff79f0d5d54ad4112b9ae7f9d317ea8048ab30c916d36a9cfbf5446ba59517eeea3ee24bc7abc7847ef0036b98fd2537334636e954143b9
-MISC metadata.xml 3436 BLAKE2B 7c72d72e9be5929fac6f655c2607e5b4140ffb499b4dd3dadfb8a23202c9dedc80650de7593331cb617dfdd04a321679c91e23f7ad187569ab54790eb1dcac49 SHA512 e38a9292bd89f0fa2027b131c60b9faa82c3e12c76caf22d3ec36fe33b51cf3dba3d5e753e2a2587dbc576d5c6a89662806f006d6a665ad1b00f87a6c1b6f29e
+EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6022 BLAKE2B 25a6ed8c7bb2f7f722bb8bc2cf14af4ca48e288e787b47f06a970531f1df0843c3ab5daff2238303264771b154b6357938cc04d6be5a65ff95838e1cb2ea40dc SHA512 bf818e0d9bc24e2653d2886a8671fcf965c94133211cca8e79d4ceabde3c9ea13a24e89c5c6d99d31a56b4ba413afcb797d928286cec9d087f727dbf40b1116c
+MISC metadata.xml 3520 BLAKE2B 061b85175547ddd4e0571cfca26438e324313143eb7435f358c9ee4eccc12eef8c5ffcd31bcb0318bd1d7b283d0da8075d1e8bc0338ec9702d42459be25066ed SHA512 9d26b18c84e6f1cff74fb8a5007f5ef1e7ef1b42aba4cc1fb408af1105433db8e1eef8ff24406071f0b7009bd29fdc924855a8a9e0bee954118c736c9e7fe4fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
deleted file mode 100644
index 99a2dd057f55..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dmalloc outb"
-REQUIRED_USE="
-	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
-# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
-# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
-IUSE_LCD_DEVICES=(
-	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
-	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
-	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
-	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
-	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
-)
-
-# Define the list of valid lcd4linux plugins.
-# Some plugins were removed from this list:
-# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
-# - ppp: It has been replaced by the netdev plugin.
-# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
-# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
-IUSE_LCD4LINUX_PLUGINS=(
-	apm asterisk button-exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv
-	loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3
-	proc-stat python qnaplog raspi sample statfs uname uptime
-	w1retap wireless
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE=${LCD_DEVICE,,}
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
-REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_astusb? ( virtual/libusb:0= )
-	lcd_devices_bwct? ( virtual/libusb:0= )
-	lcd_devices_curses? ( sys-libs/ncurses:0= )
-	lcd_devices_dpf? ( virtual/libusb:0= )
-	lcd_devices_g15? ( virtual/libusb:0= )
-	lcd_devices_glcd2usb? ( virtual/libusb:0= )
-	lcd_devices_irlcd? ( virtual/libusb:0= )
-	lcd_devices_lcd2usb? ( virtual/libusb:0= )
-	lcd_devices_ledmatrix? ( virtual/libusb:0= )
-	lcd_devices_luise? (
-		dev-libs/luise-bin
-		virtual/libusb:0=
-	)
-	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
-	lcd_devices_mdm166a? ( virtual/libusb:0= )
-	lcd_devices_picolcd? ( virtual/libusb:0= )
-	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
-	lcd_devices_png? (
-		media-libs/gd[png]
-		media-libs/libpng:0=
-	)
-	lcd_devices_ppm? ( media-libs/gd )
-	lcd_devices_samsungspf? ( virtual/libusb:0= )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_trefon? ( virtual/libusb:0= )
-	lcd_devices_ula200? (
-		dev-embedded/libftdi:1=
-		virtual/libusb:0=
-	)
-	lcd_devices_usbhub? ( virtual/libusb:0= )
-	lcd_devices_usblcd? ( virtual/libusb:0= )
-	lcd_devices_vnc? ( net-libs/libvncserver )
-	lcd_devices_x11? ( x11-libs/libX11 )
-"
-
-# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
-DEPEND_LCD4LINUX_PLUGINS="
-	asterisk? ( net-misc/asterisk )
-	dbus? ( sys-apps/dbus )
-	gps? ( dev-libs/nmeap )
-	hddtemp? ( app-admin/hddtemp )
-	iconv? ( virtual/libiconv )
-	mpd? ( media-libs/libmpd )
-	mpris-dbus? ( sys-apps/dbus )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	python? ( ${PYTHON_DEPS} )
-	wireless? (
-		|| (
-			net-wireless/iw
-			net-wireless/wireless-tools
-		)
-	)
-"
-
-RDEPEND="
-	dmalloc? ( dev-libs/dmalloc )
-	${DEPEND_LCD_DEVICES}
-	${DEPEND_LCD4LINUX_PLUGINS}"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	# Enable all users enabled lcd4linux plugins
-	local myeconfargs_lcd4linux_plugins
-	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
-		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}"
-		fi
-	done
-
-	local myeconfargs=(
-		--disable-rpath
-		$(use_with dmalloc)
-		$(use_with outb)
-		$(use_with python)
-		$(use_with lcd_devices_x11 x)
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
-		--x-include="/usr/include"
-		--x-libraries="/usr/$(get_libdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install sample config, and must have 600, as lcd4linux checks this.
-	insinto	/etc/lcd4linux
-	insopts -m 0600
-	doins lcd4linux.conf.sample
-
-	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
index c8254373f7a8..cfb01cb28216 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools flag-o-matic python-single-r1
 
 DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://lcd4linux.bulix.org/"
+HOMEPAGE="https://github.com/jmccrohan/lcd4linux/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="
 	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
@@ -73,7 +73,7 @@ DEPEND_LCD_DEVICES="
 	lcd_devices_lcd2usb? ( virtual/libusb:0= )
 	lcd_devices_ledmatrix? ( virtual/libusb:0= )
 	lcd_devices_luise? (
-		dev-libs/luise-bin
+		dev-libs/luise
 		virtual/libusb:0=
 	)
 	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index 669193270cb0..a7279fdf0c72 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -49,4 +49,7 @@
 		<flag name="w1retap">Enable the w1retap plugin.</flag>
 		<flag name="wireless">Enable the wireless plugin, to get wireless statistics.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jmccrohan/lcd4linux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/lsx/Manifest b/app-misc/lsx/Manifest
index e71e3d9583cc..4025bd1be3b0 100644
--- a/app-misc/lsx/Manifest
+++ b/app-misc/lsx/Manifest
@@ -1,3 +1,3 @@
 DIST lsx-0.1.tar.gz 2130 BLAKE2B 0293945b76d76d755675d8d57ef7f09b668d0df7997ec0e5df927dfb4dcd6d24217b27e114c498680028c52bb21c8a1106dbde2010c47d77d66acf9589e74a9d SHA512 19f3fa4ecc22817332716d58d287ab7ea4b07bbed1d909b00931b272f1613d8aeb315435495d51a5f918f53e3f0ce68e964813cdbfefce0176924f3c75aa623a
-EBUILD lsx-0.1-r1.ebuild 852 BLAKE2B acf329ff72e9e47a73fccd133575858cf36cdac05f6078e6d48b803907405f780fdf15fc98eb6efdf43f37a91977905a52383651e5c7e67013ce03488f8a93dc SHA512 51d0adb918d04d522156ec631560bd2f83afaaed1661401e002f92ab27b4943f87f5ff0465cafbe80e9d7a588b256060770c7aab0b8e7c25a8148ed5c4707b7c
+EBUILD lsx-0.1-r1.ebuild 714 BLAKE2B ad30f900830734f5456c22c349962a845dc4e6437f54cdadc6233b5c32b5b3546b74d48ae00080c186fddbf90a9f8f44693cf80ee9dca79f1e116cf82b2d7abd SHA512 d8f99da2eb10aafd864be451677afeab72d42e27bbf4a7f2d6c0c85fd459eaafc1dcbcbb14f0401cc7bb44df3332bac5e9c0a58804cdcf7bebe17232b434d19e
 MISC metadata.xml 277 BLAKE2B b9389d5db9efc1f16568f1fce62c47e9fd8829608aa3084db3decedefa711e065af20f29b0c5a2d9e93beac60ed0f54d098640e56fb93824dcb0b3d2f75af7bf SHA512 99cfc61af14bb324d776b6865339d8f9626450ba2f837bced0624ed80aad5f177c35c4ac3e3cfe636d175ad1f7eb478cc735dde57a6bb691fd608c57253db1c4
diff --git a/app-misc/lsx/lsx-0.1-r1.ebuild b/app-misc/lsx/lsx-0.1-r1.ebuild
index 1cfccc2c3cd2..398cf21908b4 100644
--- a/app-misc/lsx/lsx-0.1-r1.ebuild
+++ b/app-misc/lsx/lsx-0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="list executables"
 HOMEPAGE="https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx"
@@ -13,30 +13,25 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DOCS=( README )
-
 src_prepare() {
 	default
 
-	sed -i \
-		-e "s/.*strip.*//" \
-		Makefile || die "sed failed"
+	# overengineered build system
+	rm Makefile config.mk || die
+}
 
-	sed -i \
-		-e "s/CFLAGS = -Os/CFLAGS +=/" \
-		-e "s/LDFLAGS =/LDFLAGS +=/" \
-		config.mk || die "sed failed"
+src_configure() {
+	tc-export CC
+	append-cppflags -DVERSION='\"0.1\"'
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake lsx
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
 	# collision with net-dialup/lrzsz
-	mv "${D}/usr/bin/${PN}" "${D}/usr/bin/${PN}-suckless" || die
+	newbin ${PN} ${PN}-suckless
 
 	einstalldocs
 }
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 511cee474bf6..0f2d8ec7e8c9 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,7 @@
 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
+DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
 EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
-EBUILD mc-9999.ebuild 3068 BLAKE2B 30ec8da6226e9cacda2aa1d758160b94fe4e147b27a2fbf47e121efe9eceacc6202a9b2b3407912c6950875df15228a43708620e9d4424dafd5fddcb78cce961 SHA512 da76c190a27ad94fd8b204a9a52d8e6d4f5e6fc2d7f0352839758a81241898e6ba56b60262f13d8de8eab6b115ab3fbeb8f1bcdf48777e0e92e27be912c1c047
+EBUILD mc-4.8.25.ebuild 2809 BLAKE2B d2a17486c2fd38a4ec9247bd5e3cbabeb864be1d758552828d1d458a8f73bc084084118a30aa831892a21f4ccb131ab08e4460196b281d28fc0f036f506f141d SHA512 4065fb06be203d628bc46ea6262446b93038765774e167668d585132883b7a4a8dfd387e691f7108ab0c31b45bb72993aa353993926bfeb37872062d972d8f23
+EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.25.ebuild b/app-misc/mc/mc-4.8.25.ebuild
new file mode 100644
index 000000000000..f2506e57245a
--- /dev/null
+++ b/app-misc/mc/mc-4.8.25.ebuild
@@ -0,0 +1,106 @@
+# 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 ~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}
+
+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-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 35e12355b85a..1220ef65dda6 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -11,10 +11,8 @@ fi
 
 inherit flag-o-matic ${LIVE_ECLASSES}
 
-MY_P=${P/_/-}
-
 if [[ -z ${LIVE_EBUILD} ]]; then
-	SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+	SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz"
 	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
 
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 60a6bac4b093..ce7e754ef8fb 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,9 +1,11 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 8c148479f79a1aa8a9abdb2bd386dbf9466f1afa41f4e0ed4d29a52adf7571ebca47231f32ec8cbf2760eb7a27bd6633985851fe4c8cb413572c32588a12097b SHA512 2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25
+DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 4e7744d212f0fda980e485d102702547e76b39e4b98904afb05b372af8deba4eaaec2186dc61e8b218808a2435ed81f5fa621ebf41d5877c25b091ff64e8eb8b SHA512 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
 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.10.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
+EBUILD mosquitto-1.6.10.ebuild 2891 BLAKE2B ffa8c52fa329d7f63049441465494c7ee779c2df2910eb86d48e4d6255d04d9b4d3c284164f49e01fbca54be1095d126b0273d8789db5b7e5045d0ca146b229b SHA512 b73b05f93f445e124d2ab5aa31160cb5ad5b4ca58faec68a41cc228fc50a18fbd1f088a60f1e709a1e39d09bfd7d07c9bdf6d1f8dde7d6c7bb723049da6b04fb
+EBUILD mosquitto-1.6.12.ebuild 2891 BLAKE2B ffa8c52fa329d7f63049441465494c7ee779c2df2910eb86d48e4d6255d04d9b4d3c284164f49e01fbca54be1095d126b0273d8789db5b7e5045d0ca146b229b SHA512 b73b05f93f445e124d2ab5aa31160cb5ad5b4ca58faec68a41cc228fc50a18fbd1f088a60f1e709a1e39d09bfd7d07c9bdf6d1f8dde7d6c7bb723049da6b04fb
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
 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/mosquitto-1.6.10.ebuild b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
index 4b5abada49c6..63ca564833ad 100644
--- a/app-misc/mosquitto/mosquitto-1.6.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
new file mode 100644
index 000000000000..63ca564833ad
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.12.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 ~arm64 ~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 cd23fadfab99..2e761a526c1a 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,8 +1,10 @@
 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
+DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
 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
+EBUILD neofetch-7.0.0.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
+EBUILD neofetch-7.1.0.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
+EBUILD neofetch-9999.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
 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
index 16837479730e..2b82020241d3 100644
--- a/app-misc/neofetch/neofetch-7.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/neofetch/neofetch-7.1.0.ebuild b/app-misc/neofetch/neofetch-7.1.0.ebuild
new file mode 100644
index 000000000000..2b82020241d3
--- /dev/null
+++ b/app-misc/neofetch/neofetch-7.1.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 ~arm64 ~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/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index f3ecd1b3aa6d..2b82020241d3 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 1775c7495b5d..db5a19ec414d 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -12,6 +12,8 @@ DIST nnn-2.9.tar.gz 97998 BLAKE2B 4affc609e2fa6c21547c6f9b97778a4c5d6f9dcfac3d3e
 DIST nnn-3.0.tar.gz 102636 BLAKE2B 7756fa859198b61dacea5fade8d89f7903d012fac40034d544dc6d1b044362e3d1cce01f014af274cdc13ca40c6b95ce72f735b33053c553772aab6a4c16138a SHA512 a8092e1e5970e1f48baf04a3f9f7064b2efd61bc54bf993b0545c1c2148d775c29328b8e51d5b3f94340de82a468be8547bdd6bb40023811bbcfb755d611435f
 DIST nnn-3.1.tar.gz 110005 BLAKE2B 13acf91c3333c00a1524e4bc819870768272509b6d6aebe177f26a90d27a64dc7ffd9725d94e6edeac30b261f6d63e03757f116d3f4e293ed0b06e41f66157c7 SHA512 f17bdcf95bba3eb50d20cb06725022bcdc2fae34a365e55dea1baa49e40c567e175a3d5c66fcf70f560e64a8933f0ed9a8ca39af67fd39edcb81c82be5aedca9
 DIST nnn-3.2.tar.gz 143122 BLAKE2B 1d5cb823d274e0ca8d15be75a6df149697d81abd5c60a4b7c6335317d77f5a071b917e3322b618924ad792defe3333d38e58fda0195bc0ed79bf72df371171b5 SHA512 9cdc8d0d74162ddd4b90f69a4f558a25845732497ebdb129159fda658a799a949fe237013bf69a2d6a649433254ba2ed4c65f8f10cddd119f713c1d5518ea378
+DIST nnn-3.3.tar.gz 148795 BLAKE2B 71aa01c6882b3ea95331cb97d309218b65b8a1ab515a026a49b90b9dfd3cf5eed9b1337bb1d1d39a4b3f9e21f4d2bc0f24b29c380b8b66a9e9d5e42139bfa387 SHA512 34b772b4a876f7b31fb7badc1d7854faacebf266e4bda29cba0d2ee8e6728b5e7a842a0964a7d28d82d39053c8325dcafe6dafeaae43e7a7cfcc0e5d5dc719e9
+DIST nnn-3.4.tar.gz 194844 BLAKE2B 5b41196af67720a3485bd68b6c08e4ab41e8308d5ed0e279ed4b215acf1cbe0e10ee3a39b47b74115111003ef5a3d9871c71bb54e3778bfbc6597eb7de751deb SHA512 91b19e9a4581c6367b5c90b8294232fb77d86df348a6b4bce0df2336cac14493bf48cad52e02e5b6b0027c2ea14e3b9f15cc70d78abe82687172169b958ca918
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -26,4 +28,6 @@ EBUILD nnn-2.9.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc
 EBUILD nnn-3.0.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 EBUILD nnn-3.1.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 EBUILD nnn-3.2.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
+EBUILD nnn-3.3.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
+EBUILD nnn-3.4.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-3.3.ebuild b/app-misc/nnn/nnn-3.3.ebuild
new file mode 100644
index 000000000000..88ef20531476
--- /dev/null
+++ b/app-misc/nnn/nnn-3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/nnn/nnn-3.4.ebuild b/app-misc/nnn/nnn-3.4.ebuild
new file mode 100644
index 000000000000..88ef20531476
--- /dev/null
+++ b/app-misc/nnn/nnn-3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index cf7f142d595b..905808bcd765 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +1,3 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
-EBUILD pax-utils-1.2.6.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
+EBUILD pax-utils-1.2.6.ebuild 1878 BLAKE2B d4a0550329edbff78d31584ff69beb5b687faccd73a0712a2ecdb94862c4509b8ec82746ce49ce502dcabf00379c34f89307c19ba6815b020a03ea06650934a7 SHA512 5021456052e309e3ae1178c7c92fdb08af493d3bcb05506b14ffd7011b7698b0d344a944937b3263758d7da9a8ad63cb3ae89fb7bf3a347b9c544fd15fd88f8e
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index 00767ccb7d09..389066a08925 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit eutils python-single-r1 toolchain-funcs unpacker
+inherit eutils python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
@@ -15,7 +15,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 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"
+IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
@@ -25,10 +25,13 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 		')
 	)
 	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+BDEPEND="
 	caps? ( virtual/pkgconfig )
+	kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
 	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 _emake() {
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 6378f00939ff..dea124c0ff3d 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,3 +1,6 @@
 DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
+DIST physlock-13.tar.gz 14123 BLAKE2B a43f151c1660c38bd028f80742637a51d5108e6769161c88fb269ac03c827e49bd20e521b8face6aa6a71a8ab65ddf8662e81e8251b74c13388070ed04d4e13b SHA512 85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c
 EBUILD physlock-11-r1.ebuild 551 BLAKE2B 50d5ea880dc464903a6d60a18a773eb0286d78923533624dda8c5db954c8b2b6ab3b587e41c3d0231d2cc842684d4c6d143989548a83318045c8e9395bb5566b SHA512 a7bebe09db65ef32be5af4bb73619d8b45dd142cf7d940f77144873b95ea3004536fe15c565c57f3ab711924a778ffaeef50992ec6fb9ee45577890e012fd353
-MISC metadata.xml 757 BLAKE2B 91000aca8e366f965b46d72494b23734db9d5866c41f2f364755b9bf1397ce673ae96a8c182ee732ca3b05fae863cb8caaf61478f708df33ad3fe21e246b4af4 SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625
+EBUILD physlock-13-r1.ebuild 827 BLAKE2B 0318aeaf8aa83b09543d73359793c089dc0e9877de7a33d098bae3d4b30ffbce073f4b82a8829814f9ed47dd9118f166be4d82c98455ce01be12bd48d96a86d5 SHA512 cf974db0960391066be2f53345b7c6f5810e107d46d07e8cebbd48193222aa03b7f1c2309a193b3265e5fadd5e58ef3202f03d903b64769e317cc37bb6a129ab
+EBUILD physlock-13.ebuild 817 BLAKE2B 5ada26b839b729c42bcc6cf056ee065d9ac692b2e2805b4681dea7d24a0e2b112f0c412a86d098dea3bbeadcdf23ed32c5e5067dd638bdb37307e428709cae79 SHA512 3d1e7e195375d1db115cc41bf138442bbbd5019b0f3feb03001af64aadf2733e07a0b955ba2b35c91e94fe1e5d6bd0cae45255666fcbaa1977e87a8573d2726c
+MISC metadata.xml 950 BLAKE2B 3fc676cd63b6c70361d47ac45781b969129100a21c5d374ba8a563dfe9da2ea5eb18e34f07502ef2265af36dc76ceae55cb9b01c58ddab753f225c951e5a6e5a SHA512 bcbd8f01cc353619824dac7dced66bb3ecbb09ae3b11c6403153cee62b9eafa2a5cbb45f1809994901be0915f23006514aa7400be16ecedf27544aa30c9bd8d9
diff --git a/app-misc/physlock/metadata.xml b/app-misc/physlock/metadata.xml
index 3a7f9b503b95..f37bd00b3eed 100644
--- a/app-misc/physlock/metadata.xml
+++ b/app-misc/physlock/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>toshokan@shojigate.net</email>
+		<name>J. Pz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Control physical access to a linux computer by locking all of its virtual
 		terminals / consoles.
diff --git a/app-misc/physlock/physlock-13-r1.ebuild b/app-misc/physlock/physlock-13-r1.ebuild
new file mode 100644
index 000000000000..b817bc5f5665
--- /dev/null
+++ b/app-misc/physlock/physlock-13-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs pam
+
+DESCRIPTION="Lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+pkg_setup() {
+	export MY_CONF="HAVE_SYSTEMD=$(usex systemd 1 0) HAVE_ELOGIND=$(usex elogind 1 0)"
+}
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake ${MY_CONF}
+}
+
+src_install() {
+	emake ${MY_CONF} DESTDIR="${D}" PREFIX=/usr install
+	newpamd physlock.pam ${PN}
+}
diff --git a/app-misc/physlock/physlock-13.ebuild b/app-misc/physlock/physlock-13.ebuild
new file mode 100644
index 000000000000..375d3288bac8
--- /dev/null
+++ b/app-misc/physlock/physlock-13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+pkg_setup() {
+	export MY_CONF="HAVE_SYSTEMD=$(usev systemd) HAVE_ELOGIND=$(usev elogind)"
+}
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake ${MY_CONF}
+}
+
+src_install() {
+	emake ${MY_CONF} DESTDIR="${D}" PREFIX=/usr install
+	dosym login /etc/pam.d/${PN}
+}
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index 0a28621ea7e9..fc54caf3377b 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,8 +1,5 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
-DIST prog-express-3.8.5-1.amd64.deb 37867724 BLAKE2B a460a4e7aad36c4a2d3054332d8e380a8b8d3639316aceb7c32053b679540e31a8398b609105f8f4169f7a1bcf114c9a793e7e9a46574a6f6bbe005222a368ad SHA512 b9246633d3d213616884f6f87bbbeb30bed9cc14d46428e284de1e47e4e0c9d9be386bca6194b880bc44f53f7b831e51e27b65905f7a75a065880666d0559951
-DIST prog-express-3.8.5-1.i386.deb 37867536 BLAKE2B 067873da13374cfc52e5ef01cd02ee5594415369269898dab6fcc651f23ae0e16f1a44414bc77125e431c1411e7bfc383c45f4b037146b18a8b727c3d8d08a26 SHA512 5be2e5292986768970f6afaa16cbdd1740a610221f2de3cc21dbf751201753a1064d26d0714e482f9c95a310063aec6e2b31a8fa8a020d1d80583c0b84e0115b
 DIST prog-express-3.8.8-1.amd64.deb 37892996 BLAKE2B bc1a7cb59d1e5b2f2dc83598a00c0714127f20a35ff7acc768c2a305459e7a362da2f86c283dbc049e5a9200b2aedd2b019444106ae387e2f4b8ed5fdeeebfa3 SHA512 60d5f7592df20b0fe3119cc4e8e8c9aa6168838c6636b90cda6b9068d4dccf7c025593ee977a370cfbf7ab1fc3bf8373e46bdd0cdb27337874142c9e9d0603a6
 DIST prog-express-3.8.8-1.i386.deb 37892672 BLAKE2B 0735385044db036185c1005622645182fc354d799d1c869cf6e52e4269ab44eecf7c8211eb794ae885332ae8a4ac4a43d7ccdf58548cf50fa82ee65c71138ed4 SHA512 fd91692b7da9992224a657bfc1c48dd07ef0b7813efb7ca640ba57c23ece04a5791e43c246820739ce045dae89aa2b02b0404a419b296f14cb5f703ea59c8ed4
-EBUILD prog-express-3.8.5.ebuild 1617 BLAKE2B 2d5c78601aed379cd65e6caf773046625fef92e38e81e951c00690d194b7f00907583091ac58de6e702cebd1e6b0bc8ce36fea0b4664d4ada594b7baa74b63d7 SHA512 1d639b8c80a359e97db9b4f76a8b051eec078ef8a1ffb51e4ed9da3e7558e3cfb0b0c817809d3403c495026bfa299429c5b8da0b06a361b7527778d4b6f813cb
-EBUILD prog-express-3.8.8.ebuild 1619 BLAKE2B 760175a47233f6499702e31758b2728f0359de50b85289ffff46452725eb4c35588f13e1e7369f49c98e88b29e9899859066c776fb71f24f546b6154edc192f6 SHA512 ac003fda207c3c1423959f92a8d63d8c39366841e70203fe049de95654a95f89a841b795e7e1b08e0f42306bf7cf00248545fb6d85184c9fc4360eea77ed3df8
+EBUILD prog-express-3.8.8.ebuild 1617 BLAKE2B 2d5c78601aed379cd65e6caf773046625fef92e38e81e951c00690d194b7f00907583091ac58de6e702cebd1e6b0bc8ce36fea0b4664d4ada594b7baa74b63d7 SHA512 1d639b8c80a359e97db9b4f76a8b051eec078ef8a1ffb51e4ed9da3e7558e3cfb0b0c817809d3403c495026bfa299429c5b8da0b06a361b7527778d4b6f813cb
 MISC metadata.xml 404 BLAKE2B e39e8e0bf53e344e95e80073ea8f88652831e8be20b801a403c83c401571e7b9ef68707a61354f0b15a7469b80f4da6fe460bec364fab6138fe9cee10cb08125 SHA512 59d4a3766eeaf1d963c48223a5b68a0d999d7aafde06bc7f671d08d6d8c0934516c17bf548560e1aa9f5394003cc54afa79e57c2d6b261aa1d81a3307fc93882
diff --git a/app-misc/prog-express/prog-express-3.8.5.ebuild b/app-misc/prog-express/prog-express-3.8.5.ebuild
deleted file mode 100644
index 36d37730f297..000000000000
--- a/app-misc/prog-express/prog-express-3.8.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop udev unpacker xdg-utils
-
-DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
-HOMEPAGE="https://www.batronix.com"
-SRC_URI="
-	amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
-	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
-"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="prog-express"
-SLOT="0"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-dotnet/gtk-sharp:2
-	dev-dotnet/libgdiplus
-	dev-lang/mono
-	dev-lang/mono-basic
-	virtual/libusb:1
-	virtual/udev
-"
-
-S="${WORKDIR}"
-
-DOCS=(
-	"usr/share/doc/prog-express/changelog"
-	"usr/share/doc/prog-express/manuals"
-)
-
-QA_PREBUILT="
-	usr/bin/bxusb
-	usr/bin/bxusb-gui
-	usr/bin/prog-express
-	usr/sbin/bxfxload
-"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
-}
-
-src_install() {
-	dobin usr/bin/{bxusb,bxusb-gui,prog-express}
-	dosbin usr/sbin/bxfxload
-
-	insinto /usr/lib
-	doins -r usr/lib/bxusb usr/lib/prog-express
-
-	insinto /usr/lib/prog-express
-	doins "${FILESDIR}"/pe.exe.config
-
-	udev_dorules lib/udev/rules.d/85-batronix-devices.rules
-
-	doicon usr/share/pixmaps/prog-express.png
-
-	domenu usr/share/applications/prog-express.desktop
-
-	doman usr/share/man/man1/{bxfxload,bxusb,bxusb-gui,prog-express}.1
-}
-
-pkg_postinst() {
-	udev_reload
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-misc/prog-express/prog-express-3.8.8.ebuild b/app-misc/prog-express/prog-express-3.8.8.ebuild
index 899e0b637b5f..36d37730f297 100644
--- a/app-misc/prog-express/prog-express-3.8.8.ebuild
+++ b/app-misc/prog-express/prog-express-3.8.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
 "
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="prog-express"
 SLOT="0"
 
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 5f779e20ad09..dcd1056b1949 100644
--- a/app-misc/radeontop/Manifest
+++ b/app-misc/radeontop/Manifest
@@ -1,4 +1,4 @@
 DIST radeontop-1.2.tar.gz 35319 BLAKE2B 52a92b86379c9340b8f59b3039a4ad725827e1b3ee2bb7d2f544d6ec8730e03ab1baab266edbc263195e68ca56a4e7b3f251337401775fff588fbfb8bae0751d SHA512 f36c2e418fe8add77080642e575b99c092afeda24811f33ee161a8c9341decb611f631e5511a5255089d63e172eda6836295e5795c3ebd3f5cad172f7599d862
 EBUILD radeontop-1.2.ebuild 956 BLAKE2B 6ba9a297d6367d6370dc2393b4ccafbfb876168755ba29f51944d93253866e6490126b5d11defb354bf113786a5dc7448a16373ccb0fa5b08af6923d20d7b697 SHA512 192d78b9c90a8473c5cb54fca7fa89fed17394a44ed8353f55c327802794bc3eda18853dca7bdebefb769e63aaab2aedb014711f073894dabf00d87ceef56ed0
 EBUILD radeontop-9999.ebuild 748 BLAKE2B 3679dd2dccc6d14c0143d888453c5eac4f57483b9ee27fb1e25a2499b23dcf3150dce541c8967f53d31cabed3fa55421cec56deef48596c537ae6bf5bb5f4e8c SHA512 eda32f616f03f1ddecce6510a2f1c14f11c6108cfda99c700fea5a423f45a788cc1ce538e3cb1ff6cc1c45578dd6227c31bd49a43531d5393f578ba7fc790924
-MISC metadata.xml 461 BLAKE2B 685cbe6d06bd43110fc0693b41ed63bace9ed7447e513074b569b10d2d2a431c9660880d74b7133584b35cd9a1d85f74b6e183d39918de19ac2f82f489a43cd6 SHA512 28ba026cd450a45a7ec9d16b09df6f35039c47277d2115ae97501a3af98eb405655e7b7262adca9277c18819fafa1f2b58d94682faa9fff1bba36677bab60fb2
+MISC metadata.xml 451 BLAKE2B c4ca2856ca2629b92995ade4871f9e8108b33908d6a9909b770dabe48f92cfdaa1a3f3dda03a78dda9ceee1db2c69355390cb737c60b5134ebb38f92608c153e SHA512 20fc03e321f528b1728b3ea4ec408101eac67931240ba5ef88235569b2a80b88856dc974d75264a3f67c720da2963ea77913c6bd88ad06f668aee35fa40e98bd
diff --git a/app-misc/radeontop/metadata.xml b/app-misc/radeontop/metadata.xml
index b7acaa774ca1..f42aa641e444 100644
--- a/app-misc/radeontop/metadata.xml
+++ b/app-misc/radeontop/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>m.mairkeimberger@gmail.com</email>
+		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index af4dbe153f0b..2fa4a8ac59e9 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -2,5 +2,5 @@ DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee782
 DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
 DIST reptyr-0.7.0.tar.gz 30718 BLAKE2B 7cdb3c95deeab82898d41dd5047cd15ff288229145b64fce8efc5360d205a575a4f421ed52885c6491d56858fb7d1f09f0e8588a3be62d021bd26e554bb1ed25 SHA512 d95a05634f7e4e55f487577baee50fc773f0d9957be5ac1a678bd0434baffd994c08a884496f6400ee101333c310eaaf2150f9053d3b4b6e525820a7ed24a8e6
 EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
-EBUILD reptyr-0.7.0.ebuild 771 BLAKE2B 5a33a4f79a8040ec398a01eb9350c17c7c5d65706a28292b570e38539f3a3aac7fb082054e902754bed5d97db2cba92770cb53eef964f3a09cc0d6b86e1b379e SHA512 883f97472603864c8e90df265da8fb89be2531c62b788f8dee534c0d900578f9c8fb549c02f8aa47aea2d4c8cac33d3664b67979e5847ae1bf04f5a3bcd6e883
+EBUILD reptyr-0.7.0.ebuild 778 BLAKE2B f91b1ecddaf2c744a7e62aee5fd3c52aed826588260fa5fa781334fb010321bcf1a222646eab5b8381fed9f2e26e339f0fb17505d9825907da312db49adccaba SHA512 771bcf91f3b194d9a384aa487bc5021871d767b689ba78b29f3c55f50ad0f46a243276614cfe6e8898d82dd83eb5204c504fc12918146a1fb53b27372e39d301
 MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/reptyr-0.7.0.ebuild b/app-misc/reptyr/reptyr-0.7.0.ebuild
index 4b6afb00c2b2..d6e4db1d9cc3 100644
--- a/app-misc/reptyr/reptyr-0.7.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index b277ffdc6f92..b218da6f64a5 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -4,6 +4,6 @@ DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9
 DIST resolve-march-native-0.9.tar.gz 7688 BLAKE2B 78ef662691071b480fd382a30024f9fc73ed8f7b22b3a814237c99139d3ba6d22f348ead7c413d199875ed74768618ac97d897204a7f633977a5c5bd8726154a SHA512 2079153a1d7f8f352baa1a0000d9e120d976bca8cef2a81dde85ba1689a260fb899c8b6d97f9cd79dda41c5b67b9fe76bfdf0fc5bc88ef09d2915a29f3ed33e2
 EBUILD resolve-march-native-0.9.2.ebuild 486 BLAKE2B dc0a9990c7da42847d560aa4df84c2edb6fc720d13b3090358e82c9e228b1b1e7c12d1bfdc2e47d30f00e9453d35334fbe71d5fab23a57e4fe1e98b0a38b870c SHA512 a591cec96d1bf8900df12e33f455ad1979fcee82f976248d2864a12ab9336175bf9cf3bfa18ebff05fe4964cb825aa66326e5dcc1e33b0a64bef133ab82a9fde
 EBUILD resolve-march-native-0.9.3.ebuild 494 BLAKE2B 08038fb9245b3b5534f5c84f2d810afd7fb0fdccfede013a6fd9d187a97103823a2cbf356460f0164c2f33021191d92f0f493edb7c9e5d5508427f81b909234a SHA512 15f9e227049bff342f40927997fc160af12fc8ff4269e7aa8b094dba22b8f7647c8cf2487551af508e46fb8ba947fcadfbedd093b2ab146a47f6d7aa55bebac9
-EBUILD resolve-march-native-0.9.4.ebuild 494 BLAKE2B 08038fb9245b3b5534f5c84f2d810afd7fb0fdccfede013a6fd9d187a97103823a2cbf356460f0164c2f33021191d92f0f493edb7c9e5d5508427f81b909234a SHA512 15f9e227049bff342f40927997fc160af12fc8ff4269e7aa8b094dba22b8f7647c8cf2487551af508e46fb8ba947fcadfbedd093b2ab146a47f6d7aa55bebac9
+EBUILD resolve-march-native-0.9.4.ebuild 492 BLAKE2B ba2ee580fe76bb2912e11a65ee69a7674e3cb138249b48e2fb0953410a4eb1191577149b46f4e026dcb265bf25012eef7967f5bacf0daee8f3d8278c472b1222 SHA512 96529512eb5c178d51f6cfad78241a61ddeda7a32c4fa35eec5429a534b6e630ed05f073b6d4b8013dc90fdd078fd3fc7d615d6468b81d5fd9777edac12b5e02
 EBUILD resolve-march-native-0.9.ebuild 442 BLAKE2B bc0d1a73c4e58c75a7ce0ea00bd152218781602a225a6fb895d112addc71015ecac6ccc6a9ab86c4bc5c37306ca9f22c8545a99a72ecc5de19521b16b470d85a SHA512 399cd94d773ec28b5dd53961c290aa6a9c5a0a99c089df3f4e348cc877876f0b0c0560a97eaebca104c954b61108a510f71060909dd9f11d003e0beef248b24f
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
index bdc28fb3778b..257a5e627391 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index f21f838e82bf..edfd500fc6e5 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,111 +1,107 @@
+DIST alga-0.9.3.crate 37838 BLAKE2B cd5e31d9445c5a1e4b4f86f333843bccb5600416b43f5ff5e90540e0ddbe72fde1aadb0a7da81aaaaaa1537a2ca865e262ee828386192c20f66ec28e3e04c6f7 SHA512 dbfbdd98b4fc382e98efd0a63b28fa8591c6c882ad238ea376640ac3362003de0c6fa7997e4001f248710426b330fca735515c3827e7eeb064bdf470aef9086c
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b4038319414bde74761f0b1584baf8426f9735cd0076d1dde829a056a07e8f820d85737e5b1bf371d9510551c367025c SHA512 3853684c3b1c5c63204304f2e4f1c673b92311125c1df0fc16e96bd6f765e8266079e8d4ec3c85fad933361638c7515d5be18a2fc551353c4097051d0bd96ae3
 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
-DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
+DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 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 csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
+DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
+DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
-DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 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 dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
+DIST generic-array-0.13.2.crate 26715 BLAKE2B c0ec536cd455b82fedcbc201820090db78c798ab69b3bf4e185a5b4860dfa560e0b9d6d87d991cf99ec406867b98e3cf0cb48761b0a91bc25833e12cd59fbe2e SHA512 7039c1d0e4f8f9b0518ddd807adb7e0e86ebee056bc8562eaaa3f7360b6a953b8be4d5c2660ad62a68e42eb242111ee98fa961c0e8a74bde532970bcef3dbe4a
 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.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
-DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
+DIST hermit-abi-0.1.15.crate 9597 BLAKE2B 012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a SHA512 f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 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 libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
-DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
+DIST libc-0.2.73.crate 502354 BLAKE2B 72120cb5f110870b571724710a082222025f40df6c2ab770cb9011ce75ecc259d22c7f296e2aea8ee967af476d70b5e848fb7d4b3656d694e7a22435b723a0b3 SHA512 e24581325c43c7aeb6c9b4d48dbe7ab103f2defbbea9a3c6358e7a71ef357c0ca5dd71afe3cfaa2b699dca4d5cdd2ceb41964e007d715fba6c326d3262d51343
+DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST matrixmultiply-0.2.3.crate 32224 BLAKE2B 32da2713c816364c35ed60dadcece4999c9d90401da8d09c4b6a2be0ab55ce8d3537fbc62568bb6b169081a12bb58306c343d98fe5af382ac8e8654918bb96b9 SHA512 97eee72dd78a13693bec24a38815d9c18a531d9f85c14180e291ce6ef325b3060213fa865a2002a2388f99bc30524c9517f7a58ee5f8aa150c0b5a51da737337
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
+DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
+DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
+DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 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 ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
 DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
-DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cdfbfb2417234a97dc12dab97195f88171b51cde7284b6117e48c2754e89a8d21f0ddaf7086d69b223748f00aa9f0cbb44438b1 SHA512 a1e23486c7f4af41b419b4c833789e0edd0506bc774e3504fff2bc5bc88c2f8799ae545b79138e6ce686f479ec703f90112589639bae861b99daef0f08496885
+DIST proc-macro-error-1.0.3.crate 23736 BLAKE2B 194430b63d71644f8bfe2b919a915f2f828827d5235199cc5f62a6914794a4098b2653d291ace74e597ffb0076cebaa318d6f1fab611d6d887d1e5679c0233b2 SHA512 a689eef04fb86c87172ca718049e34d7a1b20ecc95ab981b94348161f1461a31df6b89d96177e8d9912908e40dc297aefc673aa3938dfaa65ae7155b89678769
 DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro-error-attr-1.0.3.crate 6963 BLAKE2B e07befceb22c21ae34d6f8cb0961565a091f62ea9a17d7717d95a4f1e9f96574b1cc77ad841e7683aa5779ee7197bc677304545078b3592c46e6ea60141fd7f6 SHA512 0e52a14814c4723646e17be9097faab2da74f8bd41a085dd57d6aa1dd1c978ed8b4fb98b85f39d4e313cec996af6f3d2ca6216ace03585ad8cd8678c05c025c8
 DIST proc-macro2-1.0.12.crate 35819 BLAKE2B b4207a6e1baa1a5bccbe61e898eb97f7ff874fa4db13cd4657def82d6120f65c151ffc4accc7036204dd32bbf4d065ebfc8b37675d99647b7b6782612656338d SHA512 4918cf60005aa322ad7afcdf2f6352f95414f5652a85742334bfd8f246a9f5438b5e4a1ae8d7f04fd07d2a1ac3eb18e118fc49367a91183778c74814704d5715
-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 proc-macro2-1.0.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
 DIST quote-1.0.4.crate 22965 BLAKE2B 6cb3471e1024134e70044195f1c776be1835e0a5bb17a8428d5c4aab41013ee173fb8f4b3ad22de020a30e61185e966116079b9f14db177281b0515299a09c08 SHA512 cf729bdf4eabc81d92529394c6bb9e7a3d05a449d3a306c1e536e0ec9bee789d0bf0c0d3158c58b7a995a7f3c1044cd746bac84efc087cf8fd740a98a25a97be
-DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 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
 DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 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_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 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 regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST rpick-0.6.1.crate 28517 BLAKE2B b5c052c10087f343b734cbd29b015e669b418debafb9563053daab2abd276adbd02ba3d60827298504888daa6e7e1df85f1a21290a6ac0a0d772a30516f3728f SHA512 2e720e15dd0a73d043ea40c1b47f121f801169f7bb4136639a6b42d82ea49dc7c2f3981c47259f1c2ac38879952852e0b30c5b0c3681477d5804c4cbc90de7cc
-DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+DIST rpick-0.7.0.crate 32472 BLAKE2B 498fa1b0ff3451510e2f2a1bc6813205c0329ee7a941789fec3ead64d1133a26b82dd7f8d7a946b7e385b31be538e5c7a4e9fa28dabd94b5de6176ad50f299ec SHA512 d4e51f9cc5c211d0877da4c237aaa38d6930076ee6517cfdf9b0d52360ba48e51a312123971d1a6bdaf3eff92c8fdea97112a1850e3c9a176a4c7b9c05aaea63
 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 ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST serde-1.0.106.crate 73343 BLAKE2B f2d8478f457e4416971bb0daa405a3b9c9d3176c314d512ff810f61b3baf80fd0966ea14194dd093ab9bf61d1d2cc860bb8fed753e1532ca74d028734f27705f SHA512 4d60918d9ed0d4d4706b0d0a9257583aa8f150b846b0603ebfa5bf70e02b728dbe1a1ebb08220a6996f764f6461f8cbdd85f74633f2223fbcc0722f0c3175313
-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-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde_derive-1.0.106.crate 49719 BLAKE2B ae97ada2d0f6f101fb6b901af36763fee1877a53023a21ef4d7f8deeb25d7cfdda33deca34c12735fc109640fe1ed0efba56b007b98e6b9d2c5b291af0d85e3f SHA512 7ac2a3336f1d1d3c37a345cafc66995926edbb3532784589a54b755b601b8948ffea22bf9d860a97e5c2c7a1fd6700995ccfb0ff348bdfff4e80a13daa79e03e
+DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
 DIST serde_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
+DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686
+DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
 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.14.crate 50408 BLAKE2B ec0e00f6ba689773450c653e94866807a098eddb2e2f7245bbcb14afa075fcbb23c4f831d1f558333d03bc5255d1344a06f1c698a0efe3888f3fb9532bc125ff SHA512 f05d7edf430626c9281e97782bfe1d42aeebe0eb4d4689e0251906dcc67f039fa1a24e1059db88e3f4aded2a094cd1dbe68551a64116fe0b92e460080c4b116b
-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 structopt-0.3.15.crate 49378 BLAKE2B 5474b71fefea749d2bba1be76f4aeef52564b686ca6315e56192de2fa01377df82ce1331ee35c6c5c8ab25fcc936e909f2d85448d8464722bab11cccb1d7b361 SHA512 92f577714dae111b6a3c0a4b2f2e30be60f9387427c4458b1641e2589e17c6c1055c9860f3370a89bb6e1fd48333d0a88c7af007c6310ec881436a7aec444e99
 DIST structopt-derive-0.4.7.crate 19395 BLAKE2B 47d504003f99fca23ab9eb6e76ca6fc60a5509adadf6419dc15c82b00ec00ea826636e290628a6e94cd7e4745b2aefe2856035743cafa97ddca24351ca9353ba SHA512 db052fa7932d0050e93db82cad44283e04883436a2af5f63833330013985e9ac3d661bada194429aeb606781d2517383b7f5bd876125a4e02142dd6ccc6fb750
-DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
-DIST syn-1.0.16.crate 198097 BLAKE2B cd09744c44726d755d4c3518dbda6bbd36f9bf0525fb2e4a04bae745b7dbef3a9d5eebca57c210af0da1a99cceb0ffc5540b3a1c148f87ffbcb5fdbfa57f586c SHA512 5960ce6d6d32eab252b480ba7a8603d45212e0823b5c96f4147f79173674391ddca82a17d95a8ba39e58d8849ee9c50168301e4e48f97517696e3d826e58915e
+DIST structopt-derive-0.4.8.crate 19647 BLAKE2B a260833142085899cabe918c748ba661dd14d3adcca2d4e35698a4df404a81230ea4bfca8a34dcabf411efe229c9adeb7ea51b514899ca40690d18c8d477ca17 SHA512 b8819fb5958d889f7d871fd952084e7695ab061458e8c97b5be8a7171bea6dff92407fc87d816bef62e322d2aee0ed1375029aaebbc4fee17cd909a7f5a01848
 DIST syn-1.0.19.crate 198451 BLAKE2B 7b039572b2ea68c7b05fa531b618c53cec2b568b158091e7249aa4fc3438895b514568a299386c516287096ca2f8a69c4a81159bc4e1ac51e72cca9289662687 SHA512 aaf23dc81c9f2a6270abb704d51cd6f78b014917a81d716244ebb37101470465611986137e57bbbff2e16a30b85b50b75753663a28b11a93e262f7e0b36bd8ab
+DIST syn-1.0.35.crate 204757 BLAKE2B 9c4321b64390b640f34d198d81eefd048b1745446c7548ab2ded72297544d8b9d590011e87b7c3e0ad8ff117af1fde22a8e588e37af02df7b98f8ef63feb6dfd SHA512 14098301949727ffd95b419a7578e849736fc918a9065688f645ffa20334cb2ec07ad9ff7bfd60aed64dd93369f3b8a04be98d3ee919868b4bb19702be6d47dc
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
-DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 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-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 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 unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 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-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 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 1727 BLAKE2B 67a4547c436326007aaba207d5df880f5aa53f310f50573f7cc5a758e2803469c99174e6327fe62f691f04be83ef376470e634108068cfd676251aee298ddb3c SHA512 9b8c2cae542b5d7c650f3907aca05b830040ae9f3809bf92b2630f6b667082e1f1659efac089ee69f83e8eb403ed5904787900025639f3adc11344081f6b2e46
+DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD rpick-0.6.1.ebuild 1726 BLAKE2B 80001b4d34c5ad00b9981e04a44f372773b4615418a18fbe24c00fa8912acb354e8a8f81b1d09efa406709d0472cf4939e94446b0c40b58c0965e57efb36ddc5 SHA512 fafcf0e4956e0d66e1978b2ed4bb456c6447e1f00b83425a93169d7e9a99e3050ee5ac483f827136cd9a464a3fdc60cc15cca196a1e63a7c99d789ecd58aa520
+EBUILD rpick-0.7.0.ebuild 2139 BLAKE2B b229c118b09de0d29a906946734c0ef483e08861aa64f9f2d34d4f171f9218310993e6c779f89eb46bc3fe70b4ee57ea54f6256937a8d316b58bd2a604db1112 SHA512 96d2621ed615d0899e2f8f2d5e8267c6df02cdb8951c7e90c38c005cb14b564598060b86e59b3bf8099f54e8de3454eafc83cb6324f6716f33e8831fbc888af3
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.5.0.ebuild b/app-misc/rpick/rpick-0.5.0.ebuild
deleted file mode 100644
index 856fe73801fd..000000000000
--- a/app-misc/rpick/rpick-0.5.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.2.0
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-arrayref-0.3.5
-arrayvec-0.5.1
-atty-0.2.13
-backtrace-0.3.40
-backtrace-sys-0.1.32
-base64-0.10.1
-bitflags-1.2.1
-blake2b_simd-0.5.9
-byteorder-1.3.2
-c2-chacha-0.2.3
-cc-1.0.48
-cfg-if-0.1.10
-clap-2.33.0
-cloudabi-0.0.3
-constant_time_eq-0.1.4
-crossbeam-utils-0.6.6
-dirs-2.0.2
-dirs-sys-0.3.4
-dtoa-0.4.4
-failure-0.1.6
-failure_derive-0.1.6
-fuchsia-cprng-0.1.1
-getrandom-0.1.13
-heck-0.3.1
-lazy_static-1.4.0
-libc-0.2.66
-linked-hash-map-0.5.2
-ppv-lite86-0.2.6
-proc-macro-error-0.2.6
-proc-macro2-1.0.6
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.3.1
-rand_core-0.4.2
-rand_core-0.5.1
-rand_distr-0.2.2
-rand_hc-0.2.0
-rand_os-0.1.3
-rand_pcg-0.2.1
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.1
-rpick-0.5.0
-rust-argon2-0.5.1
-rustc-demangle-0.1.16
-serde-1.0.103
-serde_derive-1.0.103
-serde_yaml-0.8.11
-strsim-0.8.0
-structopt-0.3.5
-structopt-derive-0.3.5
-syn-1.0.11
-synstructure-0.12.3
-textwrap-0.11.0
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-wasi-0.7.0
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-yaml-rust-0.4.3
-"
-
-inherit cargo
-
-DESCRIPTION="Helps you pick items from a list by various algorithms"
-HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-# You can get a description of the licenses by running cargo license.
-# See https://github.com/onur/cargo-license/
-LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~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/rpick/rpick-0.5.1.ebuild b/app-misc/rpick/rpick-0.7.0.ebuild
index 527e96202c9b..2c68b9cd74a9 100644
--- a/app-misc/rpick/rpick-0.5.1.ebuild
+++ b/app-misc/rpick/rpick-0.7.0.ebuild
@@ -6,7 +6,9 @@
 EAPI=7
 
 CRATES="
+alga-0.9.3
 ansi_term-0.11.0
+approx-0.3.2
 arrayref-0.3.6
 arrayvec-0.5.1
 atty-0.2.14
@@ -14,53 +16,76 @@ autocfg-1.0.0
 base64-0.11.0
 bitflags-1.2.1
 blake2b_simd-0.5.10
+bstr-0.2.13
+byteorder-1.3.4
 cfg-if-0.1.10
-clap-2.33.0
+clap-2.33.1
 constant_time_eq-0.1.5
 crossbeam-utils-0.7.2
-dirs-2.0.2
-dirs-sys-0.3.4
-dtoa-0.4.5
+csv-1.1.3
+csv-core-0.1.10
+dirs-1.0.5
+dirs-3.0.1
+dirs-sys-0.3.5
+dtoa-0.4.6
+encode_unicode-0.3.6
+generic-array-0.13.2
 getrandom-0.1.14
 heck-0.3.1
-hermit-abi-0.1.8
+hermit-abi-0.1.15
+itoa-0.4.6
 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
+libc-0.2.73
+libm-0.2.1
+linked-hash-map-0.5.3
+matrixmultiply-0.2.3
+memchr-2.3.3
+nalgebra-0.19.0
+num-complex-0.2.4
+num-integer-0.1.43
+num-rational-0.2.4
+num-traits-0.2.12
+ppv-lite86-0.2.8
+prettytable-rs-0.8.0
+proc-macro-error-1.0.3
+proc-macro-error-attr-1.0.3
+proc-macro2-1.0.19
+quote-1.0.7
 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
+rawpointer-0.2.1
+redox_syscall-0.1.57
 redox_users-0.3.4
-rpick-0.5.1
+regex-automata-0.1.9
+rpick-0.7.0
 rust-argon2-0.7.0
-serde-1.0.105
-serde_derive-1.0.105
-serde_yaml-0.8.11
+ryu-1.0.5
+serde-1.0.114
+serde_derive-1.0.114
+serde_yaml-0.8.13
+statrs-0.13.0
 strsim-0.8.0
-structopt-0.3.12
-structopt-derive-0.4.5
-syn-1.0.16
+structopt-0.3.15
+structopt-derive-0.4.8
+syn-1.0.35
 syn-mid-0.5.0
+term-0.5.2
 textwrap-0.11.0
+typenum-1.12.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
+unicode-width-0.1.8
+unicode-xid-0.2.1
+vec_map-0.8.2
+version_check-0.9.2
 wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.8
+winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
-yaml-rust-0.4.3
+yaml-rust-0.4.4
 "
 
 inherit cargo
@@ -71,9 +96,9 @@ 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"
+LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/app-misc/scope/Manifest b/app-misc/scope/Manifest
deleted file mode 100644
index 14adc5d02645..000000000000
--- a/app-misc/scope/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scope-0.04.tar.gz 69250 BLAKE2B 9c2f2455954e56188d6074d99c4636eca720863be04e35fe79a78741c5eea0d4421b1d1069f2e88337c024dde8ce8ba111551ee6901abd5b64b8da428efa4e26 SHA512 9067b7a870d6d409c2ee0406a7ba33e5a2bfb395de4ccf9b39b39f0ed49b9b4f7290844be7d375c7638e65715b4e1f4d80bfc6f333b9bbe1de5fe695eb164a03
-EBUILD scope-0.04-r1.ebuild 401 BLAKE2B 71961debf5921f846e2f3e3e58aa5c9fa8e35c1c0622df51131c1fc8f919d9e1e74d2e1e3566774f25e2811aa88ce149357b7725cb8628b2452c83e408a33d43 SHA512 be265fb79b08556326cf89714f4066c35d3840ab1aa7fbed42e6e996208589b0c414e11c50516d97dba7f2b623e554cddcc293b488822f529013a49d4650c1ec
-MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/app-misc/scope/scope-0.04-r1.ebuild b/app-misc/scope/scope-0.04-r1.ebuild
deleted file mode 100644
index b3c295403ed4..000000000000
--- a/app-misc/scope/scope-0.04-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Serial Line Analyser"
-HOMEPAGE="http://www.gumbley.me.uk/scope.html"
-SRC_URI="http://www.gumbley.me.uk/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS=( "README" )
-
-src_prepare() {
-	# bug 459848
-	tc-export CC
-	eapply_user
-}
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index e41a083cf92e..ff5e26c8eb89 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,6 @@
 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 506 BLAKE2B 3ac4262e1c11b709f1ee83f1756a547417d4b90d85bf433dd9930bbfbde8902fe461c824b38dc49071f2865a7c201e6b9399b88704e6ccb6c4df14b17960588d SHA512 7145d18683880023c92787cd6a0084a433d15f4bf76c3b84aa1ceedaeb4645f2bcb87d0c4295ba16631cf0068108683e553d1acd32c75d3315312ca5f30b3ee5
-MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
+DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
+EBUILD screenie-1.30.0-r1.ebuild 501 BLAKE2B 14ac796383358ce287b47d8712d9c8c5d67c48006c51639140d193fb8878754b4c0f11dd0cb5b051be0912159c9a4767e042fca7147488e77729b76206fc7ead SHA512 0c124ecbdadec4605d554f02fefca829710238010cb00ac9a6f78544677d42eda379d6a594b2b7d206a0b73cd7b7bbc307c1b2bfb3d91ff7e0f26d12dc83ef53
+EBUILD screenie-20120406.ebuild 474 BLAKE2B cfd40ec8d9484b36bb1465c0c678835ace922dde4f15606eb084772145c2d4493c5a90f14f4c6c9deb5cc08ad9e4be8bc54edf04f8fd5c5ca5d862d657b963dd SHA512 3211f3795d0c715e476c09cc6e70624d7d5f4c41fd9451f6dbca78899b4c7335cfe355375ebd8f3eb001ab5ba6cdc9a2ee8d4decfe5edc637c2113a720526fec
+MISC metadata.xml 662 BLAKE2B 0c32c03641dcd4c9bb279e3c17ba672258ccfa45ef03dcba773344bad57ed910372425d12debf1af02a15f6a9971e32ca0716b7260b8f641bc84e199c31c423c SHA512 7e94f65c55ea3e466d07eaee0f69f5669da66c02ef433b75c766bdaaf403a88e9124a96cddc6a8621278e36ac68e83cdb197410faf2adfd6255f87ab7469da25
diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
index 3fcb159a037e..7e93008ed1a2 100644
--- a/app-misc/screenie/metadata.xml
+++ b/app-misc/screenie/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>rgkmg25@gmail.com</email>
-    <name>Robert Kowalski</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Screenie is a small and lightweight GNU screen(1) frontend that is
     designed to be a session handler that simplifies the process of
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
index 84d6cd85146e..4b3a0fa8a2e9 100644
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="screen(1) frontend that is designed to be a session handler"
-HOMEPAGE="http://pubwww.hsz-t.ch/~mgloor/screenie.html"
+HOMEPAGE="https://sourceforge.net/projects/screenie/"
 SRC_URI="http://pubwww.hsz-t.ch/~mgloor/data/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
new file mode 100644
index 000000000000..2b2e7eb357cf
--- /dev/null
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A small and lightweight screen wrapper"
+HOMEPAGE="https://sourceforge.net/projects/screenie/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+
+RDEPEND="app-misc/screen"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	einstalldocs
+	dobin screenie
+	doman screenie.1
+}
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index edeb70a03b91..a69cde9cb899 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,5 +1,5 @@
 DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc2704454bd2b8871518a3d525d9101abd9f2ebb11171cb57937b598125b599371908c3b32800dfbd7aeda0fb SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
 EBUILD scrub-2.5.2.ebuild 361 BLAKE2B 12c02e0203f651d963a8e03820e0c32124870f4501ffb0236652941a7a455342165107e852a84f2435e8a4732c57567ba840414292d385c8492398ff2bf08dcb SHA512 f03300f1f891d99128652209b056a90af2c5ca70dc693afd75c3846dccd476f5f129ce2ba92596f60ff6f2400182edbac31299a5109bd178c56ac748c22d4360
-EBUILD scrub-2.6.1.ebuild 388 BLAKE2B cc242146aab585229b79a6d87eb4c98486e69960df0d7e645c452126f8db257a933c788daba9acafdf68e560c0226d5ca45e0a34f31fc7a430e05f421b02e723 SHA512 48ee44abe9e819d1b555901dbb0ca8d3164ecc30cf1d058bfc1874c46c43fe12f168212d5d508e78e34ca1e10a6c5c6c5a0e2ed76818a19f0138028d48f345b1
+EBUILD scrub-2.6.1.ebuild 387 BLAKE2B 69e776ece679d3d53d64d605f01ee31e5b12ee626df3a4832c49f3f17affa01a135daccab3a5906c3b2c687bb40aaf4414216f1959156cb725f4f2fcb23c2bb0 SHA512 f7561ff780daaf7e99f0500052944176a415082defe759f6ba105de1fb48cd77ac0795994292c70df035a4dd48a7575c20c91b2d731c2743a7050bcdf3b4cb3d
 MISC metadata.xml 427 BLAKE2B cabf19dba485a1ab72e0500c58039417e3d43a16221200a291fa24ccf071592bd6fc4360dcacf03f56242a3a218a4783e4f716253056384dec0da2dd60831b6d SHA512 6df40e1c7f4e9a5dff97a24cac6e0ec70ef4932846de7499be62bcd9bad40c5e23cfe23aac3672f1c9de4aadd36b6abcf96945cd8bd6c58a87ee91f793e0a627
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 0b050cc0eb25..635cd71d32b7 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index 1c265144a32a..2e8b681ad3ed 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -110,4 +110,4 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 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
+MISC metadata.xml 391 BLAKE2B 7d5d447327e57ba0ef6d2ac0a8b45a7d2ff7d5e8201dd05df837928e0fd79329ce4cc6aa2b441d8fd90b79d332659846788e96641a346b14a8b8d49c76c8cb11 SHA512 6320760517cc0b017dc0e357fbb446683d469ea9dc51849c2232779e7128ef9f77b05298af9533dc4058f80b63ebec3f70a631c98496f39bcb94167bb8807453
diff --git a/app-misc/skim/metadata.xml b/app-misc/skim/metadata.xml
index 704e68761c93..493b495913dd 100644
--- a/app-misc/skim/metadata.xml
+++ b/app-misc/skim/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="tmux">Install sk-tmux script to run skim in a tmux pane</flag>
 		<flag name="vim">Install vim plugin for skim</flag>
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 75807e848a73..445d5757536a 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,8 @@
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
 DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
+DIST solaar-1.0.3rc1.tar.gz 782803 BLAKE2B a4dde7238f2616d98cafafa775050fd0c3a3aaf8a11b0eab333993a9246c321c45ebe4d30adddf82d826e1909a8e90cb0914472ab40f9ed5560d380931aea591 SHA512 845c55865ef93c163bae80dfe6e8e3013363cff1be03b167dcd4f30c541ae16e1828ed6e51c8c77aa8b067e3a75cd8e1980fb8847b308d067a816598f83c8d83
 EBUILD solaar-1.0.1-r1.ebuild 1120 BLAKE2B 8a22d0162004e2661426dea055b69bda82f0848aa9aaf5f3a2de1ec0b4af32d01b0fa5108730f4fed66717ec590bd5712fc7666a04610f8a5fc96291d30ed412 SHA512 a8413ffcd2d4a8348c047fff7b26f1bc3c200c2c6f2648b08195a513acac878fe27e3569f9a970ee38510dbcaba46ede35fec7e55771dc01b20522a99b3efa25
 EBUILD solaar-1.0.2.ebuild 1427 BLAKE2B 9730b21134fae5a9e5422a75a59d048e48acb737c5cbb2bea2ae0b2155f9d087debdbbaf4f20a61ecccef4d69eed75e27873bccca62df31e606e8a9c779cd965 SHA512 4895d4655540ed37c33329078df9a0dbc4387633ef7ea800f0d54854a87e793ac2e51c7808945d1751904a76e5584ab2fd9f3c1c563409d6d64bd2f27799308f
+EBUILD solaar-1.0.3_rc1.ebuild 1497 BLAKE2B 219c2e01f7bf6572989ceb1fd8005938ec5abd75160ff649898ef47c0e7ed8dd4d30a4b45c261c7a4929ff92b932e916232f98e97fb4d3d13eacc8ad2d945e10 SHA512 236e5e23e77b2dd89c908dfd1358a5a9eed7a4e6cfafba5d73edbac94c5e86a57d1fdb346e4424649200276cc4f4e8027473ced5c5d7d1d50050c327f27685c0
 EBUILD solaar-9999.ebuild 1284 BLAKE2B 516fe9ad4b43027e0e7c8cbe2eb93cc4beaec67cd973e82ef71d11fa34d188c12eea5e568ae8a469bd31b7211d3ba2e8407d8f6fa38acace4ad9032588e968a6 SHA512 0f59c7ea6fd2c63d65e68d712f0e78dfd741942bdb36e8b00a32b7e8c1486ed2fb93504429e80552544b37461baf3e3b79d84c476bd7f3f78563709de7570433
 MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/solaar-1.0.3_rc1.ebuild b/app-misc/solaar/solaar-1.0.3_rc1.ebuild
new file mode 100644
index 000000000000..37fb735fd590
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.3_rc1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+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 appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3 )
+	libnotify? ( x11-libs/libnotify )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		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
+
+	dodoc docs/devices.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index becc72fdb14e..d713761243d8 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,7 +1,3 @@
-DIST timew-1.0.0.tar.gz 140539 BLAKE2B 486c1e99a587597a040e3fb45c15602e56798b5a13ce3f47fb8d73b3995ee270ef2601e49dc4efe3023d1179a111b55c50c92a3feece87d9bad6a26123dc9008 SHA512 0539ff93b2375c154d126c39aa84f21b57b62f51c220c80b2e323a4d6aefd2eda6f87c04112e096222102b019ee3683a78b9ee9d6fbf6736d4a34c529f6152f5
-DIST timew-1.1.1.tar.gz 166484 BLAKE2B 64b8560220550299c76207873184252b1100d146ac745e46f38790a90294c59e5da95852836433f1d5213a2f1272063a534c20b2963a88fbaa1bcb888e40b70b SHA512 d262227d6dc99994599252c9fc55d32e4caac9d5ff1f223b8637005ed9f4f7fa238bd5cb7392c8e42a468f6246a7afad9b6fdb02af636e53d3bd813cfc3ee110
-DIST timew-1.2.0.tar.gz 181477 BLAKE2B 03c815dddbcc1801bd5d6849b4a6b97291ccfcae98421a3c89582b97b0214e57886a2ed485b506aafd11e16e5e8444bcfe6f457289598eb1ac671ac85004b5df SHA512 e576aff06dde1e3d5d46f4a9a425991c91c8484aa8f2eeeb8dda7a4bd40716863432740e7810c2acb43adf223a090af4e95d77994ceba03c043c57bcab745c21
-EBUILD timew-1.0.0.ebuild 512 BLAKE2B 6050789317fa16dd7c5e9ff926cefef8778c2a5d06ff2e8fdce163ed8c1de33faab0a8fb77c80bdd223b4ec2602b7efc4139da62fbf5db832adbd3d97a72d85c SHA512 0029cd62f73134e30e313929dc41bb499a081054715f7ec16234b83affffedda3e958abcc0b417267002dcb80bcc35000b91c07bc66e2d4b015bb14be3cca890
-EBUILD timew-1.1.1.ebuild 512 BLAKE2B 15a91014bb2bea1ae3fa306129df3cff014be92a528db86c6ad2361a7de9153c95c2184001799c6204e7297accd6105d3a5cc7ae298c3d376151772f35805dc6 SHA512 d6b4128865a695302bab3bd14e2fafae27e437c3362663dff545485e61642b06c1aa4703aa4361de6c0878df1cee852595b8411ec4e04aff75d853798975ed9f
-EBUILD timew-1.2.0.ebuild 553 BLAKE2B e97ba552d3aededa5367e46dbd688f049d1ef9a7f0dcd3d01e76111b0017c8306e69be3074e9f7bef5b395cff432ac0e869eb0ad94111a33bff019f1ca0d2e7f SHA512 31eaa7c7cdd658e2f2b4524d8bfaf7f6f2bdff126d81fabd66d0cb96f4718bca4096b1b0aab193eb4ab2737253c2c563998308e0d1969ac7332ec140ee5b8bf2
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+DIST timew-1.3.0.tar.gz 1125892 BLAKE2B 7ef9f6f405d710addd90758ea1188678aa3269354f81be583f63eb920c0163d0a428e9b62d896ba189f842494835df785e1f26d877bda03205a94067af8456d0 SHA512 38bf44c83d2315155ee43085957824db69d9501abf2cf0bdf51636169043d82b701ebfac3176bc1dfc0186abb7db7a3a40111968c85597e7edb73c66083f0ab0
+EBUILD timew-1.3.0.ebuild 919 BLAKE2B b2de4483dab2d91c091e45d2ee2480e9054142bf34adf4bebad4b1e589c95d5152e7f7a3e1b8a271e65cc0154e0965cb84d5d8a2df834550f71b679805ef4183 SHA512 be71ebb20ce5bb9beba8ed61747d441e063a5a5cfebb4a797bb35b9790fd1e5cfbbd1e224c1094f4048c112a6a2c236829f360b8c432dd11f68c7164ef518096
+MISC metadata.xml 679 BLAKE2B a0d48844e9b28b17958a0019744ea6366e0e7893fbedba5805f8c00b9fa3e1110f2d61462ad295409bdca399db04377417fe646408b4ef4914ec8cfed7537e20 SHA512 3a10119fa8224b6629985c9acb30900029d3507412e8c47732a214d55d6c12c7b6013c15808be318344f2fbf789f95e9b4c6e8f259dc4378597c917bcf06aac4
diff --git a/app-misc/timew/metadata.xml b/app-misc/timew/metadata.xml
index 7a38bb900964..5ea3c900a15f 100644
--- a/app-misc/timew/metadata.xml
+++ b/app-misc/timew/metadata.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Timewarrior is a time tracking utility that offers simple 
+		stopwatch features as well as sophisticated calendar-based 
+		backfill, along with flexible reporting.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">GothenburgBitFactory/timewarrior</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/timew/timew-1.0.0.ebuild b/app-misc/timew/timew-1.0.0.ebuild
deleted file mode 100644
index b17148ed009a..000000000000
--- a/app-misc/timew/timew-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tracks your time from the command line, and generates reports"
-HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
-SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DTIMEW_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/timew/timew-1.1.1.ebuild b/app-misc/timew/timew-1.1.1.ebuild
deleted file mode 100644
index 751d9bdd68d9..000000000000
--- a/app-misc/timew/timew-1.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tracks your time from the command line, and generates reports"
-HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
-SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DTIMEW_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/timew/timew-1.2.0.ebuild b/app-misc/timew/timew-1.2.0.ebuild
deleted file mode 100644
index b5cc50bd8639..000000000000
--- a/app-misc/timew/timew-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tracks your time from the command line, and generates reports"
-HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
-SRC_URI="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DTIMEW_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/timew/timew-1.3.0.ebuild b/app-misc/timew/timew-1.3.0.ebuild
new file mode 100644
index 000000000000..86785cd3972f
--- /dev/null
+++ b/app-misc/timew/timew-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://timewarrior.net"
+SRC_URI="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=release
+		-DTIMEW_DOCDIR=share/doc/"${PF}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc -r ext
+	docompress -x /usr/share/doc/${PF}/ext/{on-modify.timewarrior,README}
+}
+
+pkg_postinst() {
+	elog "To integrate timewarrior with taskwarrior, issue the following commands:"
+	elog "cp /usr/share/doc/${PF}/ext/on-modify.timewarrior ~/.task/hooks/"
+	elog "chmod +x ~/.task/hooks/on-modify.timewarrior"
+	elog "see https://timewarrior.net/docs/taskwarrior.html"
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 39e828f3e617..14ec5003041f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,10 +1,6 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
-DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
-DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
 DIST tmux-3.1b.tar.gz 561152 BLAKE2B f5ff0c68999f9d82c26ab8c781b9f2bab56501573592c741304c49eec283c073119b95ba3c77f266e808ab494577c5098730fc5fb6aad0b82340ac30fbd2310d SHA512 fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.9a.ebuild 2199 BLAKE2B 39a72e6d5e23a9f58a86ac6116a4576b0e9c89be8422c63bc0c3e8a0a7b9ee9d373a58e0a234eff7d03537bcebf41cf060145126aaa7c41b4d7bf6e215ca20d5 SHA512 02d96e880b2d5c2bfb9003a2e3120f7a5c349e7b65f97f76612b5a7469e4cbe26696770e04e5a8e5cde25038bb356e3793de11e1fcaf3ae21e124c138bed8cff
-EBUILD tmux-3.0a.ebuild 2218 BLAKE2B f0b7f6f6fcbba2548ccb42775f35d9f59b2bbb07a1fd004e83383970fadca0ae61859e24d2fcd11de8995dedc4fff2d54dbafa75bdc8d0a30f5572d6ecbaa7db SHA512 e275057fc5ee6f6ac4923b8cf95f7c4c861a2488153efedab6996f6f19b63ab890b58c9db1e403f2bd2893c6e41773413152543567d8c8ffd1d0e5fadd057b0a
-EBUILD tmux-3.1b.ebuild 2218 BLAKE2B f0b7f6f6fcbba2548ccb42775f35d9f59b2bbb07a1fd004e83383970fadca0ae61859e24d2fcd11de8995dedc4fff2d54dbafa75bdc8d0a30f5572d6ecbaa7db SHA512 e275057fc5ee6f6ac4923b8cf95f7c4c861a2488153efedab6996f6f19b63ab890b58c9db1e403f2bd2893c6e41773413152543567d8c8ffd1d0e5fadd057b0a
-EBUILD tmux-9999.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
+EBUILD tmux-3.1b.ebuild 1668 BLAKE2B 64df64ea7e44eb15464135a3bc90e28873edfce37b5d62460a4c8cfcf529b63da0567ea1a7b7a928c45eeaf29ea2976b04b0561d35915d917a3e4b77de3527b5 SHA512 1c481f113d15cce9e2ea81740ab27efa5344c0c8ffee7a316d7989e2aab1554844a606aed9c6b94d326c45da0c042ecf8fcc798ee567d039cde25f4c9a241c13
+EBUILD tmux-9999.ebuild 1686 BLAKE2B 8735eceb5eac657eeacd268a2baf4142d28c47bc74d3006d9f4eff6a7370cf1b60c33e5de2365114ea5fbd60c5988501f67867dacc0f5fc3dc156106c20bb6a0 SHA512 63ea6967ca335e3b35487562de29e2044fbeac498764b9c312df74a8dfc2f669901761f816d8ec1f8eb0668fc77757c7c62393df663738dfd79e4b8e453eb48b
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
deleted file mode 100644
index 5ff428db33a9..000000000000
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ /dev/null
@@ -1,86 +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
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
-	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
-else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? ( sys-libs/libutempter )
-"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-
-	# upstream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
deleted file mode 100644
index 11f6e03eece7..000000000000
--- a/app-misc/tmux/tmux-3.0a.ebuild
+++ /dev/null
@@ -1,88 +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
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
-	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
-else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? ( sys-libs/libutempter )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-
-	# upstream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-3.1b.ebuild b/app-misc/tmux/tmux-3.1b.ebuild
index 11f6e03eece7..7d0cb4a0da6d 100644
--- a/app-misc/tmux/tmux-3.1b.ebuild
+++ b/app-misc/tmux/tmux-3.1b.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 ~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
 
@@ -72,17 +72,3 @@ src_install() {
 	dodoc example_tmux.conf
 	docompress -x /usr/share/doc/${PF}/example_tmux.conf
 }
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 1f43a539b177..5a80c44dea65 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -72,17 +72,3 @@ src_install() {
 	dodoc example_tmux.conf
 	docompress -x /usr/share/doc/${PF}/example_tmux.conf
 }
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index b07f0ec7f193..d8852a5c26a3 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,3 +1,5 @@
 DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
+DIST tmuxp-1.5.5.tar.gz 856665 BLAKE2B fa18222840b9c221de48a78291243776a66a7aec3221f23be3218f81eae0d15ce5a4568f7eff679c01793d4ac4d441f6714c37d9ac3c9f705af49214f5dc2570 SHA512 61c14197af7742b48dab95443bb818ede20d26aa46ab2e89b883a34e2bcec910d8210fc1358fc88f96ccc637c47d6432082cd58995b80a43234cebba95240ebc
 EBUILD tmuxp-1.5.4.ebuild 966 BLAKE2B 0ac59d92dbd7af58f54edf3546393788a8f8c6c406763dd1ed24e7dec9eda9f741cf73521f129e9a6bda1dd007f91884a7c000409f4e94ececa95f67caab030b SHA512 e63a4782a64e22cc6cb060766f397504c97d71f10794db3c8b600fe1b7cb187fb37c744ec98dec773901e7a404241e354758b1e03d464bf5ee4bf7dfe4e4d57b
+EBUILD tmuxp-1.5.5.ebuild 1004 BLAKE2B e869beb49e030eac34f98f5ed4685d86df4aeaedbd7f5451f5821b4dbe2306823748a9fba49be7fdc8d54237de72e6ec3f5179570a4d05966c882163bd10dd17 SHA512 3dc466babccd1674e3548fdd27c1158b882e1781dddab79ae73dff94ced3749b937a83833d307d854f97cd27b425eee006816cb5e9131f974a09848e8b1efa46
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.5.5.ebuild b/app-misc/tmuxp/tmuxp-1.5.5.ebuild
new file mode 100644
index 000000000000..3808752d03ca
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.5.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	dev-python/kaptan[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.8[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 80f727d22349..76c1c91074f1 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
-EBUILD tracker-miners-2.3.3.ebuild 4613 BLAKE2B 6f1f12bcf4af210b4c48ede6dd31a3de6748e2dd8882c507edea4e0e3e25952be7ee13dcd142eab1f37b4d2aa02fff3d01ce9a0a9a0febc710beff12a7b93c3a SHA512 9222b7a115e3a02f49d8b1296f3a78aaa5bffb96d1fce26b1e6d8a342afb6a29f440bd6df099d2871a6b3aae6470cab1adca3befffb32648f762d1e4404c3806
+EBUILD tracker-miners-2.3.3.ebuild 4637 BLAKE2B 436138e7a33ec47ee1fe93c160de931830cd1b5c7a3294b8aa53b016a9b290621e8fdd4741930f65280c63d074570fd7210069824d138f3810222998a7e7f6ae SHA512 66c19d0ff11de4d249207f0227fabac984ef53f8aa82e4b4eef4d9c4f215f508b4f3f38d322ae0d34739c69bb93f0a5e75c00adcbcff400c181d49894a1c7f2a
 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
index 580229daebd9..306bcdab411e 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
@@ -56,6 +56,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
+	dev-util/gdbus-codegen
 
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.19.8
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index c6c2c456bf32..9c0edcd0104a 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -4,5 +4,5 @@ DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fe
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 EBUILD uptimed-0.4.1-r1.ebuild 1572 BLAKE2B d671cc82a3e76873eaa2ae175208196157a4bb9fcd0edb0ce94ae6328ed399d2537709bb079bcaf156682161d7578a533e817b35e0d81cb9f5120f0bfce177b6 SHA512 cba8c853d8bae0720a8c9c8a90b9e2a6be75be297b6840ec04bc5f50351117941b95ff2c74e37e520ee5fece5d631e61c5f7031e39fbb9bec9aa693f62fd9ab4
 EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
-EBUILD uptimed-0.4.2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
+EBUILD uptimed-0.4.2.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index f0e96cbc3b14..e1746141b171 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/webcomics-collector/Manifest b/app-misc/webcomics-collector/Manifest
deleted file mode 100644
index 3e2af432d5ea..000000000000
--- a/app-misc/webcomics-collector/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST collector-0.7.3.tar.bz2 66069 BLAKE2B 55b76d24856c3edd483b02618a6a48cfa8d4427ff9e4f358cd7cfd03f050e12674dac1dadcb062229cc1f574a8251445374c55f024e78926b5adf59700384d31 SHA512 6ac846550311cbfb54580bf7971ec2fdf5a0e5321eaf75a97ff1eb91367ddbbf03421855750d21547c0910be7037a989a9be5a08d19eb9556b228faaf9c90035
-EBUILD webcomics-collector-0.7.3-r1.ebuild 871 BLAKE2B 5510922548012adf3aa90bbfa81ef2d71fd9dcfe8ad008759361eda666af3f4d91f9c0ebd9a9f00dcf09484dbf8255eac7d58b34bec3a270a3f92fc7a36931df SHA512 3f4fd1afbdbdfa2753d6f201c35cfc2a373468248630c4796de6804d869f39ff8a151d4a4655ea6bc052df9f36f936fd9ddfcbe258e6cabf0d7e3eda71c77b2d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild b/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild
deleted file mode 100644
index dcf0f208b520..000000000000
--- a/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-inherit distutils-r1
-
-DESCRIPTION="python script for downloading webcomics"
-HOMEPAGE="http://collector.skumleren.net/"
-SRC_URI="http://collector.skumleren.net/releases/collector-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/collector-${PV}"
-
-DOCS=( Changelog README UPGRADE )
-
-python_install() {
-	distutils-r1_python_install
-	python_fix_shebang "${ED}"usr/share/collector
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from an earlier version of Collector, please"
-	ewarn "read UPGRADE. This new version will not be able to use your old"
-	ewarn "archives if you do not follow the upgrade instructions!"
-}
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
index 5f3b18700088..4d88333b1e12 100644
--- a/app-misc/zygrib/Manifest
+++ b/app-misc/zygrib/Manifest
@@ -1,4 +1,6 @@
-AUX zygrib-8.0.1-libs.patch 628 BLAKE2B 44c0df4defbc2fd847e30a4fc3b8bee017a6b9419e25a43462a02bc8da6748f19692d305476443d2f8d6fcc65b8cb50f524792ea3033e19aecacbfc922937164 SHA512 c63d9c04ea2615179ebe6d7f627c4f5db39e757e6b8758da515f04cbd02263155729628d59625604cf2d6fef359d28446a40d4ebe2c7ae16752c9e1deaf8fb07
+AUX zygrib-8.0.1-libs.patch 627 BLAKE2B 0f94addb56e17028736dde079833b144f41a98612710415224d7f265d30de8affc299e609d60da168d8c9cf02a700d661d846f5a2562f7ff2b49eea0041b4b91 SHA512 99a92039a2aa4969871b212bd495ebb30eb0eadc07c9a28c3d633bd6444fb380cfba9cb9cf75804120da04f213530d8d35043031be167cb0f04da4f4240cf5a1
+AUX zygrib-8.0.1-proj-6.patch 578 BLAKE2B 739e753682fc28b050bbb4412ff7a2e244327a13cd82591bf1e2cb20c63b7f198bf6af7273bb8475ae434c6fded58ff1c92966b0ed23636be4098e90c6e521ba SHA512 4055d93aafbb9cf449c6bd9366e7927bb6ed88607abfb2ed2035eec60704cded6540d244046f4937b89b9b4e6bc650ead0dbfd633907e7658bceec4c1df95e74
+AUX zygrib-8.0.1-qt-5.15.patch 956 BLAKE2B f01b71bdbd5061c9214d69064ddc5ae847194a7f53fd4badc16a44376be61ff813a9e198dc45b9c1487d1fb4150933802be3692102120aa1e139b0f3898a862b SHA512 6c98ab47f9b5512d5dcd442d796f94fc06ebc5050fad43a0c5bac6ef33c4c05b3554fae2b9bceaa4685d4f66dfbd71db6bb4228a6392c9bf768ac12ae2ea119e
 AUX zygrib.desktop 210 BLAKE2B 0e340f8c9ae1da700e694ac2c0a973fc00264c4981376fd0aa67587a248f27f0940a80c9937cc71d52b42429d9ec891f3837344730706ca1adab4237d8df464d SHA512 fd88b992d248d0ad01374f291d792682e6ee2b5625fc792ba002f2d912bd2982c8d20aeb9bed5cf5e43a92344f1c580573e4bcf0f949cd6cebc09eff6e407b9d
 DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
 DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80
@@ -6,5 +8,5 @@ DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae
 DIST zygrib-cities_300-1k.txt.gz 512733 BLAKE2B 2e480411ab8278c57f1368e809166820d9e1f5bf931e6eaf053a2448ec808b2b60d20ad5d5517cc590fc0c3c074b41a5b388856ea6145d5f6f5938d0ed50967e SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112
 DIST zygrib-icon.png 851 BLAKE2B 15a300726e4ee486aa49116fe7ca74b655fe316ef0c1fee116e83cd949d273744d7e76ed3f4d847a40d74e6bbaa0d3ace71fea2ad7cd86f041576b6ab986c698 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b
 DIST zygrib-maps2.4.tgz 105735981 BLAKE2B b3d666481d374cadc50ec979ed8a2ed9920bd80e2bf8a01dd2aded8a39df12e335515e84e666aeb8b01f37bc37126016bf8dc63d90a0492903c6436cf5c56a87 SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487
-EBUILD zygrib-8.0.1-r1.ebuild 2003 BLAKE2B 6290e309841d2ec67f3aa936b4a700598dccfdfd1c63309172324970321543c783f6f45504d3d336d8e51db1cb032c1b83320bbb23c54a27ab03e656d686cc8d SHA512 1d3da9eb270c271745e0f9cfcee5d6811952d91189680b7183e8427854600ced387a469e556c69db15135703bd03168327a70bf53fbe59a3eb01e0d554b757b0
+EBUILD zygrib-8.0.1-r1.ebuild 2152 BLAKE2B 3ed5941c1c6bb48a6d59f99fe812926e4a403ac2fcafa4de3af769e90022ab1f6c7529deee3749b36d4b3d5470edd5d8c5bc8f45d7d2da333cb918a3ddaed522 SHA512 9966dd69d099a0210f821ebcd1fb5948e609eae36741ad721b93b610b6f883838bda057f0c360c614fbf5e6b7e76181ed25d24ac05ff9a22ee389d53ae5edef2
 MISC metadata.xml 337 BLAKE2B a1b4c21642a4ff8aef04e1d25f90b11c1b0917fc53fe706cfc56b4c2d6516a235d76d034a68393c472ba79b571c06be45b199083f29da867dd35170e0c639be1 SHA512 6d74d0109440f945eb9e224b5a81773348490beaa1f01e394749966e74b4d59b25c39a5e51c4de33bbaaf1ea4c3a59ef8d839d47fd66ddaeb01b075008e3356d
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
index b1a8937cc3cf..41df41830d9d 100644
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -1,5 +1,5 @@
---- src/zyGrib.pro.orig	2017-01-16 21:55:32.459388028 +0100
-+++ src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
+--- a/src/zyGrib.pro	2017-01-16 21:55:32.459388028 +0100
++++ b/src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
 @@ -8,7 +8,7 @@
  TARGET   = zyGrib
  
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
new file mode 100644
index 000000000000..d76a89b5e517
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
@@ -0,0 +1,20 @@
+From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001
+From: KIVACHUK Valentin <valentin.kivachuk@irt-saintexupery.com>
+Date: Tue, 10 Sep 2019 11:29:37 +0200
+Subject: [PATCH] Fix proj build error
+
+---
+ proj_deprecated_api.patch | 2 ++
+ 1 files changed, 2 insertions(+)
+
+--- a/src/map/Projection.h	2016-11-09 17:27:38.000000000 +0100
++++ b/src/map/Projection.h	2019-09-10 10:20:27.440134499 +0200
+@@ -21,6 +21,8 @@
+ #include <QObject>
+ #include <cstdio>
+ 
++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++
+ #include "proj_api.h"
+ 
+ class Projection : public QObject
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
new file mode 100644
index 000000000000..7f641bd0b9e9
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
@@ -0,0 +1,38 @@
+From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 15 Jul 2020 14:21:13 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/IacPlot.h | 1 +
+ src/SkewT.h   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/IacPlot.h b/src/IacPlot.h
+index dab76b6..59f6deb 100644
+--- a/src/IacPlot.h
++++ b/src/IacPlot.h
+@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes)
+ 
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+ 
+ #include "DataMeteoAbstract.h"
+diff --git a/src/SkewT.h b/src/SkewT.h
+index eb70372..36d4df8 100644
+--- a/src/SkewT.h
++++ b/src/SkewT.h
+@@ -16,6 +16,7 @@
+ #include <QMainWindow>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLayout>
+ #include <QKeyEvent>
+ #include <QPrintDialog>
+-- 
+2.27.0
+
diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
index 06c11e2312ca..5742b5dc7ae2 100644
--- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils qmake-utils
+EAPI=7
 
 MY_PN="zyGrib"
+inherit desktop eutils qmake-utils
 
 DESCRIPTION="GRIB File Viewer - Weather data visualization"
 HOMEPAGE="http://www.zygrib.org/"
@@ -14,15 +13,14 @@ HOMEPAGE="http://www.zygrib.org/"
 #SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
 SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz
 	https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
-	maps?   (
+	maps? (
 		http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
 		http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
 		http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz
 		http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz
 	 )"
 
-LICENSE="GPL-3
-	public-domain"
+LICENSE="GPL-3 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+maps"
@@ -40,20 +38,25 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libs.patch"
+	"${FILESDIR}/${P}-proj-6.patch" # bug 686078
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 732732
+)
+
 src_prepare() {
-	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
-	sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile
-	sed -i "/QWTDIR/d" Makefile
+	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die
+	sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile || die
+	sed -i "/QWTDIR/d" Makefile || die
 	#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
-	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
-	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro
-	epatch "${FILESDIR}/${P}-libs.patch"
+	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile || die
+	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro || die
 	default
 }
 
 src_install() {
 	default
-	rm zyGrib
+	rm zyGrib || die
 	doicon -s 32 "${DISTDIR}/zygrib-icon.png"
 	make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
 	domenu "${FILESDIR}/zygrib.desktop"
@@ -62,7 +65,7 @@ src_install() {
 		insinto "/opt/${MY_PN}"
 		doins -r "${WORKDIR}/data"
 		insinto "/opt/${MY_PN}/data/gis"
-		gzip "${WORKDIR}"/*.txt
+		gzip "${WORKDIR}"/*.txt || die
 		doins "${WORKDIR}"/*.txt.gz
 	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-misc
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)