gentoo resync : 02.09.2020

42 files changed, 709 insertions, 78 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 80a31cf5e1aa..432bf790b83c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index 33e84c73626d..bfabfe84103b 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,4 +1,7 @@
 AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7
 DIST OpenRGB-0.3.tar.bz2 2153970 BLAKE2B 2b913fd867cfd2d856d70d15ec91abd6a6d2822b367bc72f8f4275784793474beab4f442bc1af0ec3c3f33630b2f6b09d490d4f326fa4dbc4dbe11e4944cbc6f SHA512 629eb654636051b18da0f49cccf4e35dbe11a1373941cd355b27492b8382c113637d80039fa7aa749ae3f36bf838ad4da8da00f5abf5a0b8910be0ad1ecd999c
+DIST OpenRGB-release_0.3.tar.bz2 2146596 BLAKE2B fc9228d8746770440b7d6bace1a858fed6e2b2db63b84f0e403352e1bd46dd594f24d929da447acdeee22a08a9e2e5394a58107643630c5e38c9780fd02bf2f4 SHA512 53924f315fd6f35ed8530798ed5fadd6171a0e896567173e95c9ac258cfc959db6d920730e606f9fceb9d360c9c87709d65e12ba00652f500d6c2f39506c9a44
 EBUILD OpenRGB-0.3-r1.ebuild 1048 BLAKE2B 09afeb71ac750d12bafa3bbb62f24ddcb49709917dee694ffd48c9bdd90201c557f56946bb244dd10da2cbbf54415e38c6cb3c87f532bf998730a16d84386151 SHA512 b0942da786220726fbe5b6e388672e7e17ef0d719562926947fa8bf147d300384891930285a9b42604de613dfe1d72bb564ad5d1f755ec01df874a39d57f5ab1
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
+EBUILD OpenRGB-0.3-r3.ebuild 1083 BLAKE2B 4fce3f3d31af44f3f2c4076d1c3935e5864196b4fc0fd76812b799a5426c36bcffd20e8703f308ac061c5cb56fd0c1740d3288e9848a2435ab8cb689f0f435ee SHA512 3d5aea2e6b3c91389927ce45e3f5dce040c72d9936cfceef38ac490294bb0bce75dcf13dec170ad91870be001f863785ed0900cd9f10c6b1fb15f42cd537db92
+EBUILD OpenRGB-9999.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
+MISC metadata.xml 366 BLAKE2B 8d73f778c4bfa93787ee9c214130f136c4465449005929bb4614f1f90688609404f04382bfb37b7e14aa1dab61b75befdfc60df0f2616ef6ffc6a0a8932cfe12 SHA512 595c963c5b7c48aba2c50ab29bf8e106b2701ebb162c7babe2fdc51afb7463f147673a353cdd053f33952926b945463dbfe9ed5eeeea86307273a8c22cbdba53
diff --git a/app-misc/OpenRGB/OpenRGB-0.3-r3.ebuild b/app-misc/OpenRGB/OpenRGB-0.3-r3.ebuild
new file mode 100644
index 000000000000..53974fb65739
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.3-r3.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 udev
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="udev"
+
+DEPEND="
+	dev-libs/hidapi:=
+	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="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	if use udev; then
+		udev_dorules 60-openrgb.rules
+	fi
+}
diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild
new file mode 100644
index 000000000000..f8119c80c919
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="udev"
+
+DEPEND="
+	dev-libs/hidapi:=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	virtual/libusb:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	rm -rf dependencies/{hidapi,libusb}* || die
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+	fi
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	if use udev; then
+		udev_dorules 60-openrgb.rules
+	fi
+}
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/OpenRGB/metadata.xml
index cee379b15409..d481584b51e5 100644
--- a/app-misc/OpenRGB/metadata.xml
+++ b/app-misc/OpenRGB/metadata.xml
@@ -5,4 +5,8 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 6d5cb829fc68..5d206b37e084 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +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
+EBUILD bijiben-3.36.3.ebuild 1055 BLAKE2B 71f215d69edb0bc91637bd0361ac38d4c80900d9a04015a3df6354573cde3e368afd74e4b6b26cd704773267be6321b2068f4cb870deeb92c5512d1df396d83c SHA512 71f6b947acb39badc539d3f20b21a87ed20c7502b1a937de5a714836c9bd3782239d082d7f51dc3acad5bd128d8d828958fb2559222cf956f08181e15dd9205b
 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
index 88c06ee01aad..69d27cdd3d89 100644
--- a/app-misc/bijiben/bijiben-3.36.3.ebuild
+++ b/app-misc/bijiben/bijiben-3.36.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 1154e3684217..98d02df500bf 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -7,15 +7,21 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-6.8.11.tar.gz 149101114 BLAKE2B 7d6550f817c9b367a096dd0637c3d4dca6f68b95f2d3554273e5c32b5d72b6583c5ff84d2811b0cb191d2fc91d7f8bf5dbaeda3bacb94feedb018d097006f819 SHA512 a2dcbaac26b3f35437f967848fe7bfb1b873b3051bd976ccef56bd4e9f99099d8b497d60da892151939c6f63ecccbee44f550e313474cf132407d145cd1667e9
+DIST elasticsearch-6.8.12.tar.gz 149091869 BLAKE2B 9cbc8cc424b1132f3e93de8f2cc7c603202250571d3f83b798ff78f88672bbc9943b5077369b4d06723e0ed24a3c7f01f89de98a5e52ae6eb141427f2db365a5 SHA512 e962e1c1a5dab165b6ef19296ee18faa86627552561b554d4ec97c8ed1ff2b4cc5f6d46bd1268ba25d8b70aab3afcd499fdaa5e06dced96b70f64b62f2e8fb96
 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.1-no-jdk-linux-x86_64.tar.gz 161598020 BLAKE2B 7950d9570760683a939c961c0babdf66a57adfc49d541d75716ce1dc379f211f60edceae06855de0f4bfe50c9a6b1ca0296aa58fe324a28b009fb8cfe5c2a5d7 SHA512 1fd0dc28cc12f4cafe8499ca2894a00f0aef506429a3cd5fa4c9ec006e4dd281099bd0f41f1e0ff9d67ef25d5d1cf3be7f6c43c1758ef3464ee4b650fb560842
+DIST elasticsearch-7.9.0-no-jdk-linux-x86_64.tar.gz 162809477 BLAKE2B 79a0cb0a62f55876eac92edae39241ac3ca49b7655e083700ab7d8a3775cd5356049dc9b7e0ef02b5d8c638ca2d1aae0a28be029e98ae6d0c5a792d682592a65 SHA512 79dbc45fe41e352586c178085e3ee4dc87d94f9a2d883f5522acb8e8733e1663c36d58891d24f1f2813407cc02b27312bf261b98305168f614a6bb962163cb17
 DIST elasticsearch-oss-6.8.11.tar.gz 68247334 BLAKE2B d35bd5b2cec24923b03fe21e5f31055d0380c71908f9610d9897d7b97e599b65fbc98d04e905f35e7042f3b2697e89f9e927cf1b2b5b652f3a0e8731caaeaf54 SHA512 f92bd4dc68d8a42c1c5a8f424e375e4996d14d8860aef2e9a3208613a438543647e9999cdaa18870de4fb1f7d514929e535891e5cd6b8a668b2c90dab0106c51
+DIST elasticsearch-oss-6.8.12.tar.gz 68241645 BLAKE2B c62790e136c3c968b03a927d6fd67a5f8d6feae14a522213dd2432db1b53f14e931b40eb2120d47d23d7a8895487e2f8a03aaaf66098758a39d802556530b72c SHA512 9f6179ee49baa48b49c5328b88ddf2f0ef868f49c1f04d77975622120749725c48ac09cd565c05f6033eb227eaff905aff9f881a85efcf2fa75cc586cb8c45cb
 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.1-no-jdk-linux-x86_64.tar.gz 75134201 BLAKE2B a3c88ad5f94a5cebefc1a5a3a913a62bc6c8751a78c179a05667f47da71c41b480edf8d7f962ad34aa8ab0eac8168d7b8cd57f33068c17ae7e0a8d5414fbc924 SHA512 f0caa06c1172b25d8f9cb9ddced72185aaaabb1b6d7f31fe1ba67172346236651ca3bc560e7ef206b4bf9521f228d46ee98df2e41b129253215135b583086ccc
+DIST elasticsearch-oss-7.9.0-no-jdk-linux-x86_64.tar.gz 75601594 BLAKE2B 7e6edba0cb4948a8602b188193d88337cb0061a519059a23055e36ae3ab8d7df95f5c85327cb049286915872c74ec9b6adc2df21566d5eea007d134f7e3a0920 SHA512 6ec0bbb5a9f2bbf7bf78aea2999be2216f47b9f96caba27f99d40bdcdbd9f78f55e804643240fa97438cef375f4f7237860998e1d63fc401b8930d64eddea800
 EBUILD elasticsearch-6.8.11.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
+EBUILD elasticsearch-6.8.12.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.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.9.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild
new file mode 100644
index 000000000000..6191d3d9e2e0
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre:1.8"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/elasticsearch-7.9.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.9.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.9.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
deleted file mode 100644
index 4bf0e089ad76..000000000000
--- a/app-misc/evemu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
-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.7.0.ebuild b/app-misc/evemu/evemu-2.7.0.ebuild
deleted file mode 100644
index 64f996d75f11..000000000000
--- a/app-misc/evemu/evemu-2.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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/evemu/metadata.xml b/app-misc/evemu/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-misc/evemu/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 0ddfd3d380d9..9f358b9ed9df 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
 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
+EBUILD gnote-3.36.2.ebuild 1546 BLAKE2B 4ce85d4d9ff99dd114b5bec5643d9c438ba77a563c8c878aa72d1fe2e789163960d18910d09273f11861561175d215fb128613d3dfceb192aedeaf16f2406fda SHA512 ef696ad04560cb4d27a7446e19f3d04c9fb8877a227e77c1f7dfc3c47aa2f276db6b7b095dbb484f94911a13a379f41bb298f090c7efb65ad400e2eef6895528
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.36.2.ebuild b/app-misc/gnote/gnote-3.36.2.ebuild
index 95d5527ca525..0a1202afea6c 100644
--- a/app-misc/gnote/gnote-3.36.2.ebuild
+++ b/app-misc/gnote/gnote-3.36.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 7d1169d4c2d2..c4df7f4ba9fe 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,5 +1,6 @@
+AUX graphlcd-base-2.0.0-musl.patch 334 BLAKE2B 4930f69284c65ac852c54ce921fc3860bfbb34b2402daad3c58c0bc1aed704065db6b8698bd004b0eda95d8bc23b7a39ebdef42a529c40ca766fc685d21efbb4 SHA512 02f5628e59d0d0144ab51d8eba5abc914d7fbb10997d0ed90fddaad4f359b7cf390154bf70743a7edda9ab14fd56d4af37f9f1761385fa7965013be7623cdfaf
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 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
+EBUILD graphlcd-base-1.0.2-r1.ebuild 2264 BLAKE2B f380c5e9573837ce363ff70f48525ad23b016a96ddcf754dddb7625445d966c8b8a5d36c4161f25873e1ca49d0e1c50a1326b62b9798620247cc664fcfbe3a8f SHA512 4d8b5d1d6d91dcaf00ecf0fe553fc97f98f7f233d674b6fc3a15cab20c2611b05e647a45b4276bb5946ef907ae346e18341b853f743ea2ce446ed74da81080d8
+EBUILD graphlcd-base-2.0.0.ebuild 2246 BLAKE2B a5547678f3d5d6c6fd771025fcee55a322734464c79486596dd76c99332f63463bcac885232aaf98ee9faafb3a861382e0bcfda41215f4a37fd4515030f386ca SHA512 b7379d254ca7cf03f57971bf7b26e5e726bc2e4fee8ccc43a36031d488f3fb8039193bdc1cf1648bc531a0125586998f19abb80274d3dfca7c8f971ea945cfa2
 MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
new file mode 100644
index 000000000000..388d2f93f8f8
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
@@ -0,0 +1,11 @@
+--- a/glcdgraphics/font.c
++++ b/glcdgraphics/font.c
+@@ -176,7 +176,7 @@
+  
+         int y; int loop; 
+         int num = 0;
+-        uint dot; uint b;
++        unsigned int dot; unsigned int b;
+         cBitmap * charBitmap = new cBitmap(charWidth, fontHeight);
+         charBitmap->SetMonochrome(true);
+         charBitmap->Clear();
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
index d865aa64e510..03b878878ba7 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
@@ -32,6 +32,8 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "HISTORY" "README" "TODO" "docs/." )
 
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
index ddb8aac8b96d..97b2f327bd99 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
@@ -32,6 +32,8 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "HISTORY" "README" "TODO" "docs/." )
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 290024119b93..69854a431f50 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,3 +1,5 @@
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
+DIST khard-0.17.0.tar.gz 593928 BLAKE2B 488e1df70212c856d8dfa43955e681344fb1a257d765c81820444f6435d39aec782da9d01edeeaac0b9a87412db680fde368c39c74faa82b0eff2d7a0a2dbc6b SHA512 9cb936aeaa327b9837488a752906bf603429ca0c7240703829220119049f5f62e84f7e4c90bb81799307fe446c3aa47fe6ee4112c276b6bb329c959be438ba25
 EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
-MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
+EBUILD khard-0.17.0.ebuild 1210 BLAKE2B 17fe3e43bfd65b9a619a49327528ac429b12a33427fd7807439e994f3057601cc3e5268314776468702eeeb9d5c7feed4595c3ef2bf718d579767d0b03ba0a9b SHA512 adf86ed27af6a4658298cc2c9e0c0608f63ce0ecae52341bb2fb5beae56fda8198062ba0c9024bcf8315b79a97955bfef6bee031f1fdc095cde2b6d5a85bf544
+MISC metadata.xml 562 BLAKE2B d36c685675eadef8a3d6fa9e0f3caca84c25b9d82157e003883c069bee020148981b3f409d0d4b54824b7afd333bdf46c300c46065de73f2c625ef23f8c73038 SHA512 2d7233616e782afbcafe7bb91294c9db007cbc34cb298383598af52484ac201ed70d3c7840956e2906b34ef6dd381368f9b8d6396f650dd385b893f64431c042
diff --git a/app-misc/khard/khard-0.17.0.ebuild b/app-misc/khard/khard-0.17.0.ebuild
new file mode 100644
index 000000000000..c260594faa5a
--- /dev/null
+++ b/app-misc/khard/khard-0.17.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+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 )"
+
+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 ~arm64 ~x86"
+fi
+
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CONTRIBUTING.rst README.md doc/source/examples/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
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-misc/khard/metadata.xml b/app-misc/khard/metadata.xml
index 2faaf218914d..983f508b74c2 100644
--- a/app-misc/khard/metadata.xml
+++ b/app-misc/khard/metadata.xml
@@ -4,6 +4,14 @@
 	<email>andrey_utkin@gentoo.org</email>
 	<name>Andrey Utkin</name>
 </maintainer>
+<maintainer type="person">
+	<email>holgersson@posteo.de</email>
+	<name>Nils Freydank</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">scheibler/khard</remote-id>
 </upstream>
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 20fb9d367431..8501ea253d33 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,4 +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
+EBUILD ktoblzcheck-1.49-r2.ebuild 688 BLAKE2B 62ace1bd72efc12996c2c97a1b44bee2d821307a850617906348081513df3f7a8a8d6caf6153de2e9fed1cc97a8097af87522c1550d5e4ca7e9978d0bb8c97ad SHA512 fd71ebba172db8db874292454689318188c634c15003ad3d6db8299fc2b55faad55f117136be09316b3d66f3a8a3f058f455d6067665300bdfffd775126c2447
 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
index 70b76b0106e5..293a0a673c58 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 4a239ec92480..ffede8fe7c33 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -9,6 +9,8 @@ AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
+DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
 EBUILD lcdproc-0.5.9-r1.ebuild 6563 BLAKE2B c583192d2e154aa3dfe75e022214bf514f46eb531b3173a91a7749b252ec3de3bae65a26c12057e7e615eed4f33580c2b11d433c8d83beb971cab21b46df1a1c SHA512 1a9917a1179d9fb5713e299ab17dcf0caeb89d823e06d3ec7718fffd83f9297927452ae8dc91b521edf5bba00767998a216b43a1814e8afc5857343da060d3f2
+EBUILD lcdproc-0.5.9_p20200721.ebuild 6219 BLAKE2B c6a32455fccd11f7769c39b3db5210ff75355168bcff76245f19dadb2aac7cca71eacc829f81606a9f5d427bfe0910c16a33f24a79bb6915a907187ef6c9c706 SHA512 fad279e417bb3080a190f3ff465043128edc3c6cbc27ccca148ebe82b23b2f4d42313f6fdeaa898efd0784783b19c02380f27f872d3b1aecc62d518becb50d51
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
new file mode 100644
index 000000000000..e686d591c39c
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
+REQUIRED_USE="
+	ethlcd? ( lcd_devices_hd44780 )
+	freetype? ( lcd_devices_glcd )
+	png? ( lcd_devices_glcd )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=(
+	bayrad CFontz CFontzPacket curses CwLnx ea65
+	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+	icp_a106 imon imonlcd IOWarrior irman irtrans
+	joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+	sdeclcd sed1330 sed1520 serialPOS serialVFD
+	shuttleVFD sli stv5730 SureElec t6963 text
+	tyan ula200 vlsys_m428 xosd yard2LCD
+)
+
+# 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
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_cfontz? ( dev-libs/libhid:= )
+	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+	lcd_devices_cwlnx? ( dev-libs/libhid:= )
+	lcd_devices_futaba? ( virtual/libusb:1= )
+	lcd_devices_g15? (
+		app-misc/g15daemon
+		dev-libs/libg15render:=
+		virtual/libusb:0=
+	)
+	lcd_devices_glcd? (
+		app-misc/glcdprocdriver:=
+		dev-embedded/libftdi:1=
+		dev-libs/libhid:=
+		dev-libs/serdisplib:=
+		virtual/libusb:0=
+		x11-libs/libX11:=
+	)
+	lcd_devices_hd44780? (
+		dev-embedded/libftdi:1=
+		dev-libs/libugpio:=
+		virtual/libusb:0=
+	)
+	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+	lcd_devices_irman? ( media-libs/libirman:= )
+	lcd_devices_iowarrior? ( virtual/libusb:0= )
+	lcd_devices_lirc? ( app-misc/lirc )
+	lcd_devices_lis? ( dev-embedded/libftdi:1= )
+	lcd_devices_lb216? ( dev-libs/libhid:= )
+	lcd_devices_mdm166a? ( dev-libs/libhid:= )
+	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+	lcd_devices_mx5000? ( app-misc/mx5000tools )
+	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+	lcd_devices_picolcd? ( virtual/libusb:1= )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+	lcd_devices_xosd? (
+		x11-libs/libX11:=
+		x11-libs/xosd:=
+	)
+"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/xmlto
+	)
+	freetype? ( media-libs/freetype:2= )
+	nfs? ( net-fs/nfs-utils )
+	png? ( media-libs/libpng:0= )
+	samba? ( net-fs/samba )
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
+
+src_prepare() {
+	default
+
+	# Fix path for modules
+	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+	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
+
+	local enable_ftdi="--disable-libftdi"
+	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+		enable_ftdi="--enable-libftdi"
+	fi
+
+	local enable_hid="--disable-libhid"
+	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
+		enable_hid="--enable-libhid"
+	fi
+
+	local enable_png="--disable-libpng"
+	use lcd_devices_glcd && enable_png=""
+
+	local enable_usb0="--disable-libusb"
+	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
+		enable_usb0="--enable-libusb"
+	fi
+
+	local enable_usb1="--disable-libusb-1-0"
+	if use lcd_devices_futaba || use lcd_devices_picolcd; then
+		enable_usb1="--enable-libusb-1-0"
+	fi
+
+	local enable_x11="--disable-libX11"
+	use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+	local myeconfargs=(
+		--enable-drivers="${myeconfargs_lcd_devices#,}"
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc dot)
+		$(use_enable doc html-dox)
+		$(use_enable doc latex-dox)
+		$(use_enable ethlcd)
+		$(use_enable extra-charmaps)
+		$(use_enable freetype)
+		$(use_enable menu lcdproc-menus)
+		$(use_enable nfs stat-nfs)
+		$(use_enable samba stat-smbfs)
+		$(use_enable test-menu testmenus)
+		${enable_ftdi}
+		${enable_hid}
+		${enable_png}
+		${enable_usb0}
+		${enable_usb1}
+		${enable_x11}
+		--with-lcdport="13666"
+		--with-pidfile-dir="/run"
+		--without-included-getopt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake dox
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			cd "${S}"/docs/"${docbook}" || die
+			xmlto html "${docbook}".docbook || die
+		done
+	fi
+}
+
+src_install() {
+	default
+
+	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+	rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl clients/metar/*.pl
+
+	newinitd "${FILESDIR}"/LCDd.initd LCDd
+	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+	systemd_dounit "${FILESDIR}"/LCDd.service
+	systemd_dounit "${FILESDIR}"/lcdexec.service
+	systemd_dounit "${FILESDIR}"/lcdproc.service
+
+	if use doc; then
+		dodoc -r docs/html
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			docinto "${docbook}"
+			dodoc docs/"${docbook}"/*.html
+		done
+	fi
+}
diff --git a/app-misc/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
index ad4c0fb947e1..c51a85b08c51 100644
--- a/app-misc/mx5000tools/Manifest
+++ b/app-misc/mx5000tools/Manifest
@@ -1,4 +1,5 @@
 AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
+AUX mx5000tools-0.1.2-musl.patch 183 BLAKE2B 1031bd59f3ba0279b95deb7993729747b85eb60d954272d567a30d1f4b5b8d435fa745355f07c6f570177d54124e5dea8c7830c71e1e19758d4cd92d7c46a8b0 SHA512 35c9a77d0204a737af6b739eb49f6c6b5c6c7e6b8d533eda6fb4d08ae2fbd0e4b253d194e4f35b2694575d59fdb37fb1119113bdcb9900043a5fea58c625d9c2
 DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
-EBUILD mx5000tools-0.1.2-r1.ebuild 805 BLAKE2B 6de00dbf50b046681fb6442888e724125d1894cdaffa9cd31e27ace915100ee017ce5cfc3a63eab6fe4bb0d37629f09395ab2f9a44a0d1b4db88bb2f057f30b1 SHA512 d4fa41ef9faac3ffb62f68493253e458f92aed621641b429eaf316b964ebec0ac0ff86449cb72d1e9ec05a7edd9fb01ba5385818af1573c6ae3f3a3a004759be
+EBUILD mx5000tools-0.1.2-r1.ebuild 837 BLAKE2B de390cc1d211d0599f28c29eb6b4179a08703eab31f94fdce660a88461dee981106f8e39f57962642a356bacebaae54858e8d7e41a96d334c8cde4cc857de31e SHA512 20f3f31efc0c54675262d8dc981724f9312064cbd34842a7e3c71c8d376bad3a3838e57540be53e75f02e344a7647de423eb952d986a7038af24a42c38c96877
 MISC metadata.xml 620 BLAKE2B 2a84352b9ee606fe78fd191e2a4d53a859ec850095f0829f9b246ee362db5d4defea7f130b239be42064a09be07f3327df2826eb8546ba6cb86cd310668ed647 SHA512 c025ffc47e55016f56292eabf3e3ae95b5c6a553b60599d1f24c594e155a66e9cc5bc0ca0778837997f37ac2f2c03a05aa38b0020941d1665d2ecc997fbb1076
diff --git a/app-misc/mx5000tools/files/mx5000tools-0.1.2-musl.patch b/app-misc/mx5000tools/files/mx5000tools-0.1.2-musl.patch
new file mode 100644
index 000000000000..8ed94abf1eb1
--- /dev/null
+++ b/app-misc/mx5000tools/files/mx5000tools-0.1.2-musl.patch
@@ -0,0 +1,10 @@
+--- a/libmx5000/mx5000.c
++++ b/libmx5000/mx5000.c
+@@ -29,6 +29,7 @@
+ 
+ #include <asm/types.h>
+ #include <linux/hiddev.h>
++#include <linux/limits.h>
+ 
+ #include "libmx5000/mx5000.h"
+ 
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
index dd66bb738bec..798113cdf83b 100644
--- a/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
+++ b/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-find-netpbm-header.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-find-netpbm-header.patch"
+	"${FILESDIR}/${P}-musl.patch"
+)
 
 src_prepare() {
 	default
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 905808bcd765..f8aeb4b21c5c 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 1878 BLAKE2B d4a0550329edbff78d31584ff69beb5b687faccd73a0712a2ecdb94862c4509b8ec82746ce49ce502dcabf00379c34f89307c19ba6815b020a03ea06650934a7 SHA512 5021456052e309e3ae1178c7c92fdb08af493d3bcb05506b14ffd7011b7698b0d344a944937b3263758d7da9a8ad63cb3ae89fb7bf3a347b9c544fd15fd88f8e
+EBUILD pax-utils-1.2.6.ebuild 1882 BLAKE2B 9fd22705cc7ca3b334cb02fcf068b01a30bdec5c8cfb6b1de58f98f8391551ce1708e12ee26a2137155329c951dbe0d42134aee5e6931e826d80615912db02a5 SHA512 3b2ff865d5f5db6762a107e2dc88dcfe4d3e2f5105c517d3265434fd3d710fa94511b7e50860fcdecfb1cb98dbdecd0a8ba534b954c005044669a6f3e3fed9dd
 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 389066a08925..e085328a8354 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -24,12 +24,15 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}"
+	seccomp? ( sys-libs/libseccomp )
+"
 # >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
+"
 BDEPEND="
 	caps? ( virtual/pkgconfig )
-	kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
 	seccomp? ( virtual/pkgconfig )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 0b83a061ec4b..a849f4ffa3ab 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -7,5 +7,5 @@ DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fe
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
 EBUILD realpath-1.17.ebuild 1895 BLAKE2B cb908eb328e6dec2d6c6ef972b1af4f4dcbcfcf62e8d57ccf5c3eb145940a45b339bddae384562af8be7dc41c7e59d16fc6a39c54b32a3ea1303695c6a324bc1 SHA512 9df8b4c9b5d1083aca8430e6ca880eded53c7459d1731a51c1382e8b672541e1bd711754b6755c45725a173487ec4fd67321537401e00c01aba752e4592a16d4
-EBUILD realpath-1.18.ebuild 1911 BLAKE2B 6b288e1c4c57d2015a9d6addbd3295511ebc9744bb630f2270edfa80900a4fef4ca35324019665c26cfa41f1936d0d96efb871ea8f4cdd942c7988ddb3e305b9 SHA512 b26b93a85e8689e52a8ab313f1659754d00f943ecc4ebc58e3217c9f8fe53027e0309f8b3734ae9c0ab7f790cd6f21be5e81ccd587b7cc959a5df95eef71231b
+EBUILD realpath-1.18.ebuild 1909 BLAKE2B 49f98f4653823a9449beec14330445f6cfa3a98b8931139317eef07ecd708eec63b8cf6fc37c32c5d82fb11c67d07bd2771142560b1748b5294f20d5079fbffb SHA512 016d1820804a37d839f3965f8b4323dc682c59ea68a4826d4179e18c162321793211fcd73078c2bc42eb5439df3fee1b44961079f856033b5f77b607d1a31e36
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 1068c25a2dee..a97a044428ec 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index b218da6f64a5..b20ca55afe25 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 492 BLAKE2B ba2ee580fe76bb2912e11a65ee69a7674e3cb138249b48e2fb0953410a4eb1191577149b46f4e026dcb265bf25012eef7967f5bacf0daee8f3d8278c472b1222 SHA512 96529512eb5c178d51f6cfad78241a61ddeda7a32c4fa35eec5429a534b6e630ed05f073b6d4b8013dc90fdd078fd3fc7d615d6468b81d5fd9777edac12b5e02
+EBUILD resolve-march-native-0.9.4.ebuild 522 BLAKE2B 4f05fda4d58714db1b7dd03ab4b88e18cb457f422e34b806312ec67f7d5dfea6c58ddcfc411f06fbd4e7996ccbec377928e38b8ee715743a4cb18343fe6b6892 SHA512 5b588305e313de2f87125b155e4835518bb7be7ea357059ee12c559e1cffa579694c709f05ce519ba774c99ea0d937a907ad1614c2f6f4a8ad4c97aaa0862a83
 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 257a5e627391..9382c86c9d7c 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
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Resolve GCC flag -march=native"
@@ -17,3 +17,5 @@ IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=">=sys-devel/gcc-4.2"
+
+distutils_enable_tests pytest
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 32df6673207f..8b46f0f0735c 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -3,5 +3,5 @@ AUX spacenavd-0.7.1-no-x11.patch 1178 BLAKE2B 79ecf2242c2fa28165f90954c1ae637aa4
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
-EBUILD spacenavd-0.7.1.ebuild 2337 BLAKE2B 0ae34bc6ed4bdedc3ad5cedc25ee2b7449c6be63ce967ff56104cca36c006a682421d41f0ce06ed866397738c4ca58c515f2f2253c81018aaeab09d8c3de27c6 SHA512 99414b158c674d3c4dcbeef64e912b8caf1b55cd986b50ef89acc724b5d443fe7989e7265e729c0cf9277dc2b6cbc578486f698d91dddf7b18c1dcd4703d327b
+EBUILD spacenavd-0.7.1.ebuild 2344 BLAKE2B c8875709154e76954b675f808f58f59f2c9c8faea230fc236f9d648011d712363abe96516c74c54996d215129e790416de639efdc192920778cf8d9a55994035 SHA512 1e37501840845ca62be2413148dd1dea0c891a66814cdb0a87524747cc546ff2393312a10851bdc4574f45ce256d913148783e30caf1729a1bb752acf29ef1ab
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
index a1ce45ad3ccf..47b74b2d0260 100644
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 14ec5003041f..5977c5ac4e87 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,6 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-3.1b.tar.gz 561152 BLAKE2B f5ff0c68999f9d82c26ab8c781b9f2bab56501573592c741304c49eec283c073119b95ba3c77f266e808ab494577c5098730fc5fb6aad0b82340ac30fbd2310d SHA512 fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-3.1b.ebuild 1668 BLAKE2B 64df64ea7e44eb15464135a3bc90e28873edfce37b5d62460a4c8cfcf529b63da0567ea1a7b7a928c45eeaf29ea2976b04b0561d35915d917a3e4b77de3527b5 SHA512 1c481f113d15cce9e2ea81740ab27efa5344c0c8ffee7a316d7989e2aab1554844a606aed9c6b94d326c45da0c042ecf8fcc798ee567d039cde25f4c9a241c13
+EBUILD tmux-3.1b.ebuild 1675 BLAKE2B cc2d5516ed1f0615223fe5d622a9ea68b4327fd5cec9aaf19f64f6494cbde2427ad8b3f9516e875f0518d4dad8841ea383f279db5aedcd16b7720768907125a5 SHA512 687419baa26269d72d99ac1a1b5a297ff8ee7a614fba0cb88dcc227f2ad66b9a1a974c937ff96abff071a6fc13844a89d146501e01cac3ac044cd3a71f3dd415
 EBUILD tmux-9999.ebuild 1686 BLAKE2B 8735eceb5eac657eeacd268a2baf4142d28c47bc74d3006d9f4eff6a7370cf1b60c33e5de2365114ea5fbd60c5988501f67867dacc0f5fc3dc156106c20bb6a0 SHA512 63ea6967ca335e3b35487562de29e2044fbeac498764b9c312df74a8dfc2f669901761f816d8ec1f8eb0668fc77757c7c62393df663738dfd79e4b8e453eb48b
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-3.1b.ebuild b/app-misc/tmux/tmux-3.1b.ebuild
index 7d0cb4a0da6d..45cd420cb8c4 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 9c0edcd0104a..fd9bb27642fc 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,7 +2,9 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
+DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
 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 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
+EBUILD uptimed-0.4.2.ebuild 1606 BLAKE2B 816f8ebf1e49e81716049afdaf5917647ae295209d4fb209e71e59234dacf4db4a1031edcd92813697ca660a5b21c89fc85d0c71ca7dcb9061d5e5555712f2ea SHA512 2fa5cb41761637098dc211e817e0966211c40623292c7a591bca03f48b05066ce69e3f2dd9b933dec11b7958eeb433a8967215d93d830063aa386fc4b3d825aa
+EBUILD uptimed-0.4.3.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 e1746141b171..9e22f6f7eb46 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -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 ~arm64 ~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/uptimed/uptimed-0.4.3.ebuild b/app-misc/uptimed/uptimed-0.4.3.ebuild
new file mode 100644
index 000000000000..e1746141b171
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# fix configure.ac for >=automake-1.13 (bug #467582)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}