gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /sys-apps
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
96 files changed, 936 insertions, 977 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b9419267ec9a..bd311a4cf633 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 28120b65ebba..52edab64baff 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,3 +1,5 @@
 DIST apply-default-acl-0.4.2.tar.xz 246660 BLAKE2B dfb698d6a220b426ea607a70e1c51295629e6ac4637de72cf64a8fe577ed83ceaf6beb7f8b1507ed0d059e6f16e88e1b58a24e641dd6280765c55a70fa30712c SHA512 afe3a0182b76689e41d3a6922a8459587f6013112767ab0d9b60e5197d677ee0cdabd9ebd18f9cb59d4e373b4df2f5845cabddbd382c2743a80c3a20205aa861
+DIST apply-default-acl-0.4.3.tar.xz 251744 BLAKE2B 81803993ba20a7098de2767650b452df11b065e9d130199c1b12fed52f48d4676cbc8d826735d6a62d16211f51d67131e8b379feb1f0464b8ee3999cfce77e74 SHA512 d0b14bc685129e62f244a21921f271bc7baf7f2bea1c7a3689768e4205b10092154cc84cc8136b7afd37abf0259aaa23e5049b67476a8afddcc3a2be894bc423
 EBUILD apply-default-acl-0.4.2.ebuild 520 BLAKE2B 73d380faa9de3094a406e5860439e3d61eccb5cd9fc30dbc08d73e9e09f71b38f58d1c90131e6e8ac10effc56f11f58ba5acb77f43c55a6236747306fdd0ef08 SHA512 7a766757a43671e4e8b6dceb048b1fe36f10b79fc3b836d0174c0d2b9a5555ff822914f08869aaa722e650f0115f6267266a7a9a0038b39ae032759f82b42ded
+EBUILD apply-default-acl-0.4.3.ebuild 593 BLAKE2B b3dd0bee16e0c01fc961c06ed2f1e3066a47a11261790435db557174e8ba067fa5f5d53fd557fbb4c40d31117e2d646d7b96f0936903fda388c20fc5e8159053 SHA512 3069b26550cee43999ecff6f3c9629e95c585702ce46c4cffa857bc071728247357e968384a50379e321a7919f50cdfd7491661e1dc16197ba03816cc3e8c043
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild
new file mode 100644
index 000000000000..956755978eab
--- /dev/null
+++ b/sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apply default POSIX ACLs to files and directories"
+HOMEPAGE="http://michael.orlitzky.com/code/apply-default-acl.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/acl"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/README )
+
+# tests need to be executed on filesystem with ACL support
+# skipping them for now
+RESTRICT="test"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index a4cade71b044..d71afea131b3 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-3.0.tar.bz2 562646 BLAKE2B 4acdd5469ac1b36ff149231ad0b1b2e4e85a54a81c24c7751ceeed569526b905c1cc6be5201c4fb6929eb48e0553f0b27016de2584ee2f702492cc3fe659c2f9 SHA512 0d61f0b183c0d453275913741020c54c2915be9df45be706203e2278b125f4a02c75865117a7a2d587a034caa9bf109b2f498a4d522cc103c3879cc4a5d4854d
 DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91ae84c5bdc6f8f69063a54bd192332f5dd1d22ee5a737243eb5fb74cf0362eace1b50a73f7c1d0557a8cba146dea01 SHA512 ce120239b411c6e177af0e22a16b583ac3ae8903ba13579878942492e4e221355da28f737d6c78811312bfcc888af7c8dba6c153673f4e1542cc2aceedf2d2c9
 EBUILD bleachbit-3.0.ebuild 1188 BLAKE2B 80de495f6744ef7fe7f4003e095b5bc42909dc4e415702f95d49ebdec3296e8d3fe3238ae521938875e49f1bc2e3fcef0a39c1226a95ecffff0664c7c57ceb1c SHA512 d3dc01d9679e378cc4c4e4b4b782be0a367b67a19a6dc130944bdadcb6995a9244cf7eed9d180b7a9e9f32ab32996bc6f3a8326c22e5886431e9a22824aed846
-EBUILD bleachbit-4.0.0.ebuild 1484 BLAKE2B 36ffb7d38b9cdea16721d0266b0c1377ad121deae55487b0e8ac025135c71093cfd2667ed6413c42dbc0bb56d844ded5b9e699643cce2756a3c08e1ab3360ddf SHA512 79d1fe77689de65e4718e80d80b1c841abf8a96aea7fcfccd0fb0584e9e9ff56275359efb178f76ae71cbdd890972a7ddc22fc4a9cd024a3bcf2ad5c29d60cbc
+EBUILD bleachbit-4.0.0.ebuild 1482 BLAKE2B 070e66a4c002c3a47f4987e9b000a5d78e05dc41ba3b597cf91e4100da9c6811ee39fccf1ada4bc703b70e9e156690a58181ddad754f1427be681bcbd2213733 SHA512 b860352fbe80dbe550646de268cfc73fcc96cde4fc90153314fcaf53b03eef2f213342612de6f76fc58b24f69406fc2af3b1e1577b6055c8de5eeff8af47d310
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild b/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
index 8ed560185347..b1996be593d4 100644
--- a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/chardet[$PYTHON_USEDEP]
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 5687a2dd01c9..a9287600d2a5 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,7 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
-DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.3.1-r1.ebuild 1052 BLAKE2B a1a1c85830ff989d7a8a879244f3bef3baaeffaf4fd8fdb5d1d4f8f35b82e249278278103c373373c00bc8bdd541ff906183d913e825cd6d4a5a61440e17cd91 SHA512 bf27b1bcaab8be6f41362f75e82881389bf414df620a82f3ee157661a925e87292607cd5d5c5ead28db832a0ae1418963054d6c4c66c0858152987e42adb3b6d
-EBUILD bubblewrap-0.3.1-r2.ebuild 1134 BLAKE2B 5f6986fc4c158bad2598c28b40aaec8b72ab768e35229c8ed77862d41f6512c0f7ee80c1a57bdabbe320654e0ae7ac233d6a73b1aace6129c1cac53a6d3532a2 SHA512 7f9f58801f21c53b1bf95c4158191b82c2cdee12ce2df27997ed9eed2cce6d09934052141b994393130b734fee7409509ace7991f3655843cf754939433f7c69
 EBUILD bubblewrap-0.4.1.ebuild 1128 BLAKE2B 0dbea9f9cc66e2004efe3d2be96706f6e6be015a1f849408d8dfdd419c3745b269fde4c9d7d85c851ffb11ab706d15c3eaac234df257df0a732e264d14bb57be SHA512 22e4e6d45c7b692ea7e3a55bfd4f48e58fc0013a6aa06659ce59de3a9bfe820434fd1445aef95397a7e3b65f188497d3d7809bff759122697d344ba66a4e44ed
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
deleted file mode 100644
index dbd69baa2f6d..000000000000
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info
-
-DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
-HOMEPAGE="https://github.com/projectatomic/bubblewrap"
-SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="selinux +suid"
-
-RDEPEND="
-	sys-libs/libseccomp
-	sys-libs/libcap
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# tests require root priviledge
-RESTRICT="test"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		"--enable-man" \
-		"--with-bash-completion-dir=$(get_bashcompdir)" \
-		"--with-priv-mode=$(usex suid setuid none)"
-}
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
deleted file mode 100644
index e6912bc4ce92..000000000000
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info
-
-DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
-HOMEPAGE="https://github.com/projectatomic/bubblewrap"
-SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="selinux +suid"
-
-RDEPEND="
-	sys-libs/libseccomp
-	sys-libs/libcap
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# tests require root priviledge
-RESTRICT="test"
-PATCHES=(
-	"${FILESDIR}/bubblewrap-0.3.1-selinux-configure.patch" # bug 674312
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		"--enable-man" \
-		"--with-bash-completion-dir=$(get_bashcompdir)" \
-		"--with-priv-mode=$(usex suid setuid none)"
-}
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index fc85d4d616ee..6ae789e26dd2 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -2,7 +2,7 @@ AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712
 AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
-DIST cpuid-20200211.src.tar.gz 114939 BLAKE2B c03d703fe6cdf131886e83e31ccafdb80e435e5183d033886d1d737905667fc359d0117951d76d9c6475a7138173cba7d94f5580d5e3d4a8c0c1ec571d5fec51 SHA512 5a5bf3a57f6af3f88b234c9f2cedbb9f8b7e1fd87923da140de01ee4212bac78513cbc006471f3aacc563fb2893c66bc236e2bb27f606e22c07bd9acf612c8e4
+DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83
 EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
-EBUILD cpuid-20200211.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
+EBUILD cpuid-20200427.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20200211.ebuild b/sys-apps/cpuid/cpuid-20200427.ebuild
index c48d21a156d2..c48d21a156d2 100644
--- a/sys-apps/cpuid/cpuid-20200211.ebuild
+++ b/sys-apps/cpuid/cpuid-20200427.ebuild
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 21017a67a077..8aab4751be89 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,10 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
-DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
-DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
+DIST debianutils_4.11.tar.xz 157440 BLAKE2B a0238a97b2700119570ee80e4fb85c36a44ac6fa700fc927bda85bd5358ff364f19389160e4a01685c7263e8b3855b63197590dc65825002e532bfea98ef9f5c SHA512 87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6
 DIST debianutils_4.9.1.tar.xz 157516 BLAKE2B b2c8927e37448f4e45f19b4a7d2977198d2c610a203a2c8692a0592c8c8319c5dc42050b83435cb7381e30cc653911083b76717a53ac908113cc7388a4155167 SHA512 b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1
-DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
-EBUILD debianutils-4.8.3.ebuild 910 BLAKE2B 9c7272b0e7ebe1c08fac6bbf8d63c68afbfe3a5329b3d05128845630e8cfabcced94c786ece5834562da1c32b62af193b0ba61452c66a65f1cb4951da7b18f3d SHA512 e666ece2b317f9603bb49c63fc81d25a4e5abd82e9321b573ec42a6aefb7d64de3d0c9f96a08fc04a147ed41e23dcf04a9c6fcd079b22a8820fedef4c27def7e
-EBUILD debianutils-4.8.6.3.ebuild 906 BLAKE2B 5ffffc47ccc815289b1a70ee02ffe57528f0b97c91352c574724649be671634738ec97b76cc490661434699748f74294c250e2af1e4a1b86a4dc972e05c58f8c SHA512 44e24d8f4caf83a4687159251bd021cdbc268e4be77b99f66e5fde8d3debfbde0ffb0d05a6dfac22def89f7b27cb175e02bc4ff7921919f942e245c9bd18fc5b
+DIST debianutils_4.9.3.tar.xz 157404 BLAKE2B 527844c0bd623f3b560d544f6f041f7db7dc39c225333427bb81a5044975005b288cde58e9dfaf7f633f706f78e4ff33132c149cd6f0e918852f1170c0ae2c32 SHA512 6c5771c4737c48c9ca0cf01ad58102190d78ece41e66306a4bdf30cd7ea784a325df2a4a2b7ba371d9ba5aebaee8cf87286c423a8eff54dbfe8eb6de58eda532
+EBUILD debianutils-4.11.ebuild 921 BLAKE2B 7151da83405f097266befc29f8dfd828046e048bd273baa446bc2a89d1694a85c71b98daf38c17776747bdaf2902ed277873b129bd834424e7b7171361367eec SHA512 69efd86bdfa1886fdd832e8ea2461e97e586ca1dd0fe02c6ff38ba584f72cc2283fc88827174957d07ed09382b11d46a9f5bcab323bda233d71f279ef34bef2d
 EBUILD debianutils-4.9.1.ebuild 885 BLAKE2B 2cf203acd346e00c768740c894ba301e577e04d9fccd280d4b9ca3b56fe40a3ead94a0fa637b06356000c73dba6223acb69eb86942f8e656a3aeb54512b6d8a9 SHA512 16ef6859c60c1d57e67a12cc69ad1e1eebd7d4d4eaaa6db4814e73d6e08bcc06d56c4c3f5c74d55cbd12aca1aee5dbee853e816f5e278028fd5ac83b15fb59ee
-EBUILD debianutils-4.9.ebuild 906 BLAKE2B 5ffffc47ccc815289b1a70ee02ffe57528f0b97c91352c574724649be671634738ec97b76cc490661434699748f74294c250e2af1e4a1b86a4dc972e05c58f8c SHA512 44e24d8f4caf83a4687159251bd021cdbc268e4be77b99f66e5fde8d3debfbde0ffb0d05a6dfac22def89f7b27cb175e02bc4ff7921919f942e245c9bd18fc5b
+EBUILD debianutils-4.9.3.ebuild 921 BLAKE2B 7151da83405f097266befc29f8dfd828046e048bd273baa446bc2a89d1694a85c71b98daf38c17776747bdaf2902ed277873b129bd834424e7b7171361367eec SHA512 69efd86bdfa1886fdd832e8ea2461e97e586ca1dd0fe02c6ff38ba584f72cc2283fc88827174957d07ed09382b11d46a9f5bcab323bda233d71f279ef34bef2d
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild b/sys-apps/debianutils/debianutils-4.11.ebuild
index 45100517a242..ecc8cf6303d4 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.ebuild
@@ -14,6 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
 
 src_configure() {
@@ -24,16 +32,12 @@ src_configure() {
 src_install() {
 	into /
 	dobin tempfile run-parts
-	if use installkernel ; then
-		dosbin installkernel
-	fi
 
 	into /usr
+	dobin ischroot
 	dosbin savelog
 
-	doman tempfile.1 run-parts.8 savelog.8
-	use installkernel && doman installkernel.8
+	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
 	cd debian || die
 	dodoc changelog control
-	keepdir /etc/kernel/postinst.d
 }
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
deleted file mode 100644
index bd27efcc8e49..000000000000
--- a/sys-apps/debianutils/debianutils-4.8.3.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"
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
-IUSE="kernel_linux static"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-	if use kernel_linux ; then
-		dosbin installkernel
-	fi
-
-	into /usr
-	dosbin savelog
-
-	doman tempfile.1 run-parts.8 savelog.8
-	use kernel_linux && doman installkernel.8
-	cd debian || die
-	dodoc changelog control
-	keepdir /etc/kernel/postinst.d
-}
diff --git a/sys-apps/debianutils/debianutils-4.9.ebuild b/sys-apps/debianutils/debianutils-4.9.3.ebuild
index 45100517a242..ecc8cf6303d4 100644
--- a/sys-apps/debianutils/debianutils-4.9.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.3.ebuild
@@ -14,6 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
 
 src_configure() {
@@ -24,16 +32,12 @@ src_configure() {
 src_install() {
 	into /
 	dobin tempfile run-parts
-	if use installkernel ; then
-		dosbin installkernel
-	fi
 
 	into /usr
+	dobin ischroot
 	dosbin savelog
 
-	doman tempfile.1 run-parts.8 savelog.8
-	use installkernel && doman installkernel.8
+	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
 	cd debian || die
 	dodoc changelog control
-	keepdir /etc/kernel/postinst.d
 }
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 11657da76e1e..69538b2ecf37 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,5 +1,3 @@
-AUX dtc-1.4.1-echo-n.patch 2169 BLAKE2B 3426ecc1043fbc0f9f475664d61efce2746d091bb40528cd00f49463acc3a307b6220534d7d6f9470d6aadc22e593c851bf372c16a7dbc8165e92dc624a4ee68 SHA512 e481ed5489557dccbb31274bae2afc7798da79db63052db7e490b3428f04d01cf5661e8ce9794886a4669f5fbc783b8f5ac1993e34e9ae351a6e6207b10e4b2f
-AUX dtc-1.4.1-missing-syms.patch 851 BLAKE2B f846a06b2af8ab8879cc1f34e1b2132467c8e09f107db79e1d98523146cc4760b7c79ff6d9f795154953dce6206d5c1cbca2f08136f11069def6154b59b73aa0 SHA512 8217b73ea88f5e48ab4192074f6ce6dc21eebd1cef362fabee32fdd7a50951a2c55ea8d738e43d140763b93821b8f84dbe35c8871c6018a4d56191bb3f3e9ecb
 AUX dtc-1.4.4-posix-shell.patch 1232 BLAKE2B eadb56c06e7ff7699d462e3c4c50d1f2c6eda2024443ea24970e7b7c1f9ed1dc8ec5d097aa2a6ae9cad7f934142a9fd9d13d75e6262acc26ddbed8e32a4ffbf2 SHA512 f8d21d1fc4d9c441f1214cd122303efd6aba6f87f2130486be154fa5a94599a94033361481be75bec6b19e9c7ef73986d2ac35cab1af199f390d8a0969d89185
 AUX dtc-1.5.0-fdt_check_full-visibility.patch 259 BLAKE2B db9ba9d714c16c07d3b138e1cb50d39dcb991f98bdb8b1c819018827f143e9554621c7eb2dc42b746076a39cce6f66246f8e1d304a45b91c5ee42c3b04d6b596 SHA512 49d11a3b85342ecc81f7af167439c216dcd9b94621ac2ceb8ffcb96775164b65a11047dce7b19352d73621c587c1d0c242179542c98d87a1772e7b6e3424d9a0
 AUX dtc-1.5.0-gcc-10.patch 1693 BLAKE2B 4887f0fc548343605930dc434a1a426435446d0c1d44cbf633218aa3cf90001bb97142b4a6851d5a163b893f138bd282f18d47278a1d782647c4ba1fae46be50 SHA512 2b0cf9e111b461684da7900f7f13062514c46be4c071f39ae7895be56456d80fa6a73a3798f533017a14d769194eca5458504fdebc1c9740eab149c5a2f29811
diff --git a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
deleted file mode 100644
index cd45b952a49e..000000000000
--- a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From ed3d76cd1c8f91f5e86424e899448d6221b0f76c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 6 May 2015 01:53:39 -0400
-Subject: [PATCH] tests: convert `echo -n` to `printf`
-
-The -n option is not standard in POSIX, so convert to printf which should
-work the same in every shell.
-
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- tests/run_tests.sh | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index c870432..0dda54a 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -42,20 +42,20 @@ base_run_test() {
- 
- shorten_echo () {
-     limit=32
--    echo -n "$1"
-+    printf "$1"
-     shift
-     for x; do
- 	if [ ${#x} -le $limit ]; then
--	    echo -n " $x"
-+	    printf " $x"
- 	else
- 	    short=$(echo "$x" | head -c$limit)
--	    echo -n " \"$short\"...<${#x} bytes>"
-+	    printf " \"$short\"...<${#x} bytes>"
- 	fi
-     done
- }
- 
- run_test () {
--    echo -n "$@:	"
-+    printf "$@:	"
-     if [ -n "$VALGRIND" -a -f $1.supp ]; then
- 	VGSUPP="--suppressions=$1.supp"
-     fi
-@@ -63,7 +63,7 @@ run_test () {
- }
- 
- run_sh_test () {
--    echo -n "$@:	"
-+    printf "$@:	"
-     base_run_test sh "$@"
- }
- 
-@@ -106,12 +106,12 @@ wrap_error () {
- 
- run_wrap_error_test () {
-     shorten_echo "$@"
--    echo -n " {!= 0}:	"
-+    printf " {!= 0}:	"
-     base_run_test wrap_error "$@"
- }
- 
- run_dtc_test () {
--    echo -n "dtc $@:	"
-+    printf "dtc $@:	"
-     base_run_test wrap_test $VALGRIND $DTC "$@"
- }
- 
-@@ -126,7 +126,7 @@ asm_to_so_test () {
- run_fdtget_test () {
-     expect="$1"
-     shift
--    echo -n "fdtget-runtest.sh "$expect" $@:	"
-+    printf "fdtget-runtest.sh "$expect" $@:	"
-     base_run_test sh fdtget-runtest.sh "$expect" "$@"
- }
- 
-@@ -134,14 +134,14 @@ run_fdtput_test () {
-     expect="$1"
-     shift
-     shorten_echo fdtput-runtest.sh "$expect" "$@"
--    echo -n ":	"
-+    printf ":	"
-     base_run_test sh fdtput-runtest.sh "$expect" "$@"
- }
- 
- run_fdtdump_test() {
-     file="$1"
-     shorten_echo fdtdump-runtest.sh "$file"
--    echo -n ":	"
-+    printf ":	"
-     base_run_test sh fdtdump-runtest.sh "$file"
- }
- 
--- 
-2.4.0
-
diff --git a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
deleted file mode 100644
index 7057be7bd8ac..000000000000
--- a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@linaro.org>
-Date: Tue, 17 Mar 2015 16:00:34 +0000
-Subject: [PATCH] libfdt: Add missing functions to shared library
-
-The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
-subnode iteration" adds new functions (fdt_{first,next}_subnode) but
-forgot to mark them as 'global' in the shared library.
-
-Signed-off-by: Julien Grall <julien.grall@linaro.org>
----
- libfdt/version.lds | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index 80b322b..941208e 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -54,6 +54,8 @@ LIBFDT_1.2 {
- 		fdt_get_property_by_offset;
- 		fdt_getprop_by_offset;
- 		fdt_next_property_offset;
-+		fdt_first_subnode;
-+		fdt_next_subnode;
- 
- 	local:
- 		*;
--- 
-2.4.0
-
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 9161dd79e71f..dd0c9d039800 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,6 +2,6 @@ DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.6.tar.xz 281084 BLAKE2B 1fecc52e9031a3d13cbe6b3c508ebd7fc6dc03b02d4126b3ddd9ef40eedbef151b66f52e80b6570d45ebba09437b587124d2c22817da7d4f3658bd1ff1d3c8a1 SHA512 9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199
 EBUILD ethtool-4.19.ebuild 457 BLAKE2B 30ef8577bd69c976e7ebd73f02bbcab300cdde178baee0a4dedb43289070f0adfc7ebab9b9c9c5b2040519fc0cd609a072fa94a3f4231718124f62a38fd34e3a SHA512 bea8e41a09aa1e06d4897b009948a536ac301db04283d739064135a6a622c1856be44c3af301bf0684c47e83777b9255baff7ff09a7625f992ebc08d5f6a64a1
-EBUILD ethtool-5.4.ebuild 458 BLAKE2B 6590591fb947e2daeca4953ab424b0c1e08f8f84db21fca88f9cbf3c86a2de47c0ab2046a71d7181849908364d9ba70c7b23d2a5cadd61f85d8ef532f63a681b SHA512 38763c6c35bb51e877f1ad4fd218f05e0609176580848a63f1b8adcabab5ed7195bf6e1166edad41ea69f930dc8c8399f7a0c2658a1899e09cf61224ea407cc9
-EBUILD ethtool-5.6.ebuild 465 BLAKE2B b3a0abf2d14ebf4317cd56e27d9d12c320e94e7b55993dcbc79a593a480a10bb14454ced45802415fb44792aa2c64bcc6ff36c37fea941db2f04d2020c94c155 SHA512 b3a5466fb06a497a1809e25514379d058f16cdb9bf71454b92d172803686a243cf297736d4bd0070f9729860ec442b5aa25cf1f973627abdbc971bee4d1df118
-MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
+EBUILD ethtool-5.4.ebuild 457 BLAKE2B ce0d2ef607cc8970596e8a27c677eaa8ca24d03c41d879f107a6c0981ef33cdc75b1a6f63ca402467d0e02a39e253866995867b2242e1f4a5c205bf19011129b SHA512 28e8a1049a95e8d6ab2ea8b2728af57c57c4e271cb1648059289bd176143607b7a332d9efb455f8ed86a1882ff779f1bd6c2d03555c02feb84c24f64bde5be9d
+EBUILD ethtool-5.6-r1.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
+MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index 25a67f41d620..8b709203d4d7 100644
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.6.ebuild b/sys-apps/ethtool/ethtool-5.6-r1.ebuild
index 11b54c899686..804cce9dde3e 100644
--- a/sys-apps/ethtool/ethtool-5.6.ebuild
+++ b/sys-apps/ethtool/ethtool-5.6-r1.ebuild
@@ -10,5 +10,11 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+netlink"
 
 DEPEND="app-arch/xz-utils"
+RDEPEND="netlink? ( net-libs/libmnl )"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 760ac849b6bc..81acd210e0ed 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -5,6 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="netlink">Enable netlink interface via <pkg>net-libs/libmnl</pkg></flag>
+</use>
 <longdescription lang="en">
 	ethtool is a Linux utility for controlling network drivers and hardware,
 	particularly for wired Ethernet devices. It can be used to:
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 6cf6fa9159d3..3e5a407a509d 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -3,18 +3,27 @@ DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f122
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.28.crate 26549 BLAKE2B 856d810ebc8765e173601e74e7064ee524c615fda87adcb8e49d6d1c76857edcfdfa8c480bcd1892c0b8be26e3cff3ea9333f3edbe7c60386e48e1deb3f031f2 SHA512 d8c2aa7ae279fe5b9b9ecba1bce3acd14f0087f98c494e6727ea3540d59ae021e373fe4d27e07b942061591cabc68cdd7b1abce4970479d0d44851e9fca66524
+DIST anyhow-1.0.31.crate 28514 BLAKE2B 1177bbac61e96eb007a7a9a79499a7dab08a5c828987221df32c137b69bed53473b37f01debf49a7da0883407c6da40192fbc800c9b7983128738b2889d327a4 SHA512 e60394f48b74f8db4e61b9bfdb146b8e7a8b014c0a729ccb9e657d648a9310e642c77f6e5e5d4c8a6ed40a65c65bda79e45cda9a3efd04a901376e3912aebb8a
+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 base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+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-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
 DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
@@ -23,26 +32,35 @@ DIST ctrlc-3.1.3.crate 11792 BLAKE2B eada522e42753c751bae996f2e6af5cf9fd685c1e72
 DIST ctrlc-3.1.4.crate 12702 BLAKE2B 96437ca96cc75eac980623a7ae15e9ecd224f7d6373744f39b16ff0fdac708bc2761829c1d8de2bc4c66a0f6e7fcf7791831044447e9d0ac6521e4da4d566d98 SHA512 1a5101d11b57c4000edfe3cec6367d59c4a59d4db3b0c39fb50a86f175dc89bee3494950c301317e6137250499cc39aa9b30bf94042caf08cc185152743a5b2f
 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
+DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST fd-7.4.0.tar.gz 60366 BLAKE2B 70cfaea591ed7d58ab068fba1cba20432e70d52ddab9b0dcc48570452b97abaa9881074312114483b2280ef0fdec8f4e9ec170cf48ffc7dc2986a68bc68ca80e SHA512 abe42ffedc8bb4ac5ddff9ccfe0d38dc70604ab0184b6e300a3800735d82d25f48b7b01d3cf94a5b661810d66f706517549dcb636b01fd41cf6d8b5b31eaef31
 DIST fd-7.5.0.tar.gz 62622 BLAKE2B 97ba0e5d61f4f20a73dd19c7a37856415607913ac96ad0fb18d2b84ffd1a2c3b9ca8ee001bcf3678f47bd4126003b57d94b7624e3d10fc9a1e65d80a5da89625 SHA512 bfaacd14ab48594eb1ef751673a0301590a7301d80040fc2dbc05506cf92d1f0fdc59786aa09af3e37112aaa12bbbb85492b96a017e85495e640569257d42ad3
 DIST fd-8.0.0.tar.gz 71474 BLAKE2B a46cdf9af53156e1fa864562313352867b14e8a027ce0935e8581fa9a6b9addf8e325338ddf6142082a3c2d3a8b0d718897e720e46463b6948e7746b18de6dfa SHA512 01f7caee8edd7ce45bdcc041dd39b4adc58d89750ea7de624911b0a64a303269f588356a4ffe64f27fe04527970b7eef1e4f31f6c4f36eec349af6df9ce74800
+DIST fd-8.1.1.tar.gz 75702 BLAKE2B 9bf5a18edd54cdf797c6279d2ed3181f0b7ac6ca3a54843bd7e8f3f070e9aecdd0d7b51922a420e330fecc5f6427b16be09302504ea26fbfb3beefe0f3a2a3c2 SHA512 71c078deacd498ebd9e52e32c4208c35383035ec7b87513b4127319c0294b598ce8fd9ad1acb7d665f6b64024b69f6f9fe3ace93da9f1504b7d5875018204352
 DIST fd-find-7.5.0.crate 62505 BLAKE2B 4cc4aa4a75ba34c26df03c1ba14e48c80365beecb6bd73087a01a6f50cba8866ccc4a5a3b22501e8a603e659ba69f5c04f1e55599e3d0b923e39da297c7fe99a SHA512 873ef1d4134a78833cf5f09dd7131c3083c1d2ed5330dbe9735a1d52edf9c2e014cc8d4e441333e7b8fc3c11717db4588c2434cc2f98c8ee0a10fdcdadf0080d
 DIST fd-find-8.0.0.crate 71246 BLAKE2B 2f884ccf1b9ceaf6c08d7c60846d25c3f69e34fdd43c3ea34b17a9c65bb0ce7896cd423a2898db2b10b45a3f911f26789a7322a63a4f4dcbc72c379ec34d5572 SHA512 8145da321c184c1984c8b2289403e24bddb3494f9264050491248342c0eaa4fce920bfb225ad7c779a7390e2c06ccdc208d085883ce227eb1bde54349dfc8b9a
+DIST fd-find-8.1.1.crate 75449 BLAKE2B 7f94b2c74fcf1b919c31cfde182b29f7409af1c107a5ca603d1d933568a65606db6c18128a6785ebf626a9aa9e26e2eb885f65b40c214f7074ee52864730a37c SHA512 fd9e887940e662337b6b1ff949ed60619e8996b52ff481dcde820d680a3eb9ba6676b710a8b2be7fde6a769089efbf49d857d06d64263965f58592524fff68d5
+DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
 DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST filetime-0.2.9.crate 13714 BLAKE2B ecb936c59560628fe9a9f3f29232f1c77de9529c7a8749bdb1dc9db4421f916e79e40380f63c925b6c5cd0fa2bb9e5fbc2bc7de0198e9ec134b39b6f4b224f70 SHA512 81e3ae02d498d6329fec2bca08c7237ccd0375ed7d2937c19777355f49258193cfb2aef6c8b5419bac04cf07d511123236240d0f910ec1e94d3649f2122fdbec
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST hermit-abi-0.1.11.crate 9203 BLAKE2B ff6f5325f9439979db9b592a4465f343399991e7ec6f0f38a5ab8e1621d83b1b8e9f46b3ac4b6a76f22364367546dd6fd8edb87556eca4c690f93ea9d09126e4 SHA512 b44fbe8d7674dc5a610da9d2c58baede69f7b942e08c214131a449483bd41afd0d221be2eed8ce8d71581be066b1717ee6d80876c7621a10391199fbb79ef1fd
+DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
 DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
 DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
 DIST ignore-0.4.14.crate 51922 BLAKE2B d93eeaf945fa5165461979e2f54969b9e2ccf2f4986bbe465fba8a1f0f750ce66e82c1cc48d526e2115c8ed302daf37aa368503bd56d627ebdc9609a3136576d SHA512 eea97e9a80c9ae67b2f8e970e6d4362e8b2ed2067b6c94f8de51f851133db5e782fa0cedca835d342bc66af4ede3716a4ad97c9e0129bd5b78f8f6aacbfe23c6
+DIST ignore-0.4.15.crate 52328 BLAKE2B 12567e87ae3c5cbf6daae21b4b1a7df7270f95734a8e2d21d7eb038e7a195b8fdb78da646c00fb232f2357ed1eccdd10c747d8985e0edfa6ae847be361203977 SHA512 f12b152a841d29a812af12d668648a142b79b4cdb01eb8c59ef9574c7c7bbcd7321b3e049bb3931866c3b26c196dfd3a48f7e5df63fa5923cb13a2daf0033f46
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
@@ -50,6 +68,7 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
+DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST lscolors-0.6.0.crate 17577 BLAKE2B 163fbb3b212af633d73a3ff73808ef13cb687e66afff5d3a15cef992ce6c4af8960baf826abfd098ce1a2d4fdb90178b780dd81404859be2ce748027f6a5448a SHA512 245e5d9fca5355d7135d089f9b1f66e4863b38829f52625366c6bf6eb7f1837d7b57ca30967843e2a6219b602618bd2048ab2a31912110083d177b7939f39e81
 DIST lscolors-0.7.0.crate 18036 BLAKE2B 6ed35013099c9adcbb6f1a471216138cf12592928a098ff2312dd227744e2208a001e812a77d63cb729cf2b66bcdb0188ab1ba51d78d7f80a88bfc8f1ae5623e SHA512 470bb3ec7d603959394e561a1f3f1d037479da48f966ff822bf8ae4f7e724be87523adc6b5225ee4521a7bffae15ef67f60d0c04488c12e30cbec45651198bd3
@@ -67,27 +86,34 @@ DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de65
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
+DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
+DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+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 void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -95,8 +121,10 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-util-0.1.4.crate 10089 BLAKE2B 5dfae5588233a6fa10ec000b3c5de17679e7636bcfb70cbbc1b2b1340543334125b413d53583459823be253a32b90279eba5a3a8debb404390d0328ed6377352 SHA512 2a90921a30ca021b6178b175b780e4803f40ac87f35bcb63bb09fbc9c79f8f991dd94fa3a0fa525c2e38354d9f6dee780a6cc5ea0a24bff49356d052f6bb8231
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fd-7.4.0.ebuild 2055 BLAKE2B 8b22369803867d82eea3f124823206d9b4a54a4330dabd41a965c7946b89eda8a98e15b897b09a91c02dd5e8c3917e6a96d44d86346048924e06fdbca0ad8e3d SHA512 9d8a6b7684e702d7e8710e4f6a6dd1fe995545e20fb8eed749150ec7246cec47d29f22f59f75582c88a61043f0d004e4d13c8730a57ef74e9dfd201d85d68241
 EBUILD fd-7.5.0.ebuild 2106 BLAKE2B 174f7c2a780ea44343e5029ad249a458baaa150c4b3c4725545473523fe414eeba6902cc931910f41334cda323347400e9162b5045bd61d16dfe448cc3937b5b SHA512 0d6c19b6108163cf3d70c39a00939f85108a71dab2df92f266370ddd562d81a810f412d948db742fb59c613ab54492a3f81f55a5e3a736ecd4cf1cf20986c279
 EBUILD fd-8.0.0.ebuild 2121 BLAKE2B 696ede4829db59853bc588f218539ae8fcbb2f99d5d7e78d068b28b5157941da02da5eee8a4a76941cc3d978bc2d4f66f4fc4a11d153eb2d96f9f2edf65c878e SHA512 f1523774f3f84188607effc106c2ee9fd5d05e39c850df073134283a30a1a7842cf84c2b97433bfcb359eae06e74fa4a7e1ee7cf0808e8c54b66e3eb57d53678
+EBUILD fd-8.1.1.ebuild 2241 BLAKE2B 86175487eb9c25fb3ee30cf29be5d364eaf5bbf8198dd0f3fb6092f61bedca808606a1a9b1472cc582d4179cf8bf3624f7d24ae9b5b7036ecc9a76b3da7fd540 SHA512 849bb75505b9b1a90c172e59f4fbd9acb558cdae5260667a822448a3962286882cc5f59ab02d2dbc5287260e64ec4a57fe8d8006733dff7561c0e7a6e4863a0b
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-8.1.1.ebuild b/sys-apps/fd/fd-8.1.1.ebuild
new file mode 100644
index 000000000000..9fb7f2f6dfd1
--- /dev/null
+++ b/sys-apps/fd/fd-8.1.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+ansi_term-0.11.0
+ansi_term-0.12.1
+anyhow-1.0.31
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+bitflags-1.2.1
+blake2b_simd-0.5.10
+bstr-0.2.13
+cc-1.0.53
+cfg-if-0.1.10
+clap-2.33.1
+constant_time_eq-0.1.5
+crossbeam-utils-0.7.2
+ctrlc-3.1.4
+diff-0.1.12
+dirs-2.0.2
+dirs-sys-0.3.4
+fd-find-8.1.1
+filetime-0.2.10
+fnv-1.0.7
+fs_extra-1.1.0
+fuchsia-cprng-0.1.1
+getrandom-0.1.14
+globset-0.4.5
+hermit-abi-0.1.13
+humantime-2.0.0
+ignore-0.4.15
+jemalloc-sys-0.3.2
+jemallocator-0.3.2
+lazy_static-1.4.0
+libc-0.2.70
+log-0.4.8
+lscolors-0.7.0
+memchr-2.3.3
+nix-0.17.0
+num_cpus-1.13.0
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.4
+regex-1.3.7
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+rust-argon2-0.7.0
+same-file-1.0.6
+strsim-0.8.0
+tempdir-0.3.7
+term_size-0.3.2
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-width-0.1.7
+users-0.10.0
+vec_map-0.8.2
+version_check-0.9.1
+void-1.0.2
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
+HOMEPAGE="https://github.com/sharkdp/fd"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/fd"
+
+src_compile() {
+	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+	# this enables to build with system jemallloc, but musl targets do not use it at all
+	use elibc_musl || export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp "${T}"/shell_completions/fd.bash fd
+	insinto /usr/share/zsh/site-functions
+	doins "${T}"/shell_completions/_fd
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/shell_completions/fd.fish
+	dodoc README.md
+	doman doc/*.1
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 0a0a3c24d4a0..85baf38263aa 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb86
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
-EBUILD file-5.38-r1.ebuild 3398 BLAKE2B e8d6f99613bdce90315d04a5de6a1d775b8e4407e7b1802584032557f8c059d289cc1036cf6b9ece9b852b55f3a917a7f56cd9289b293370b1742e9f51c435b2 SHA512 c8acd62367a93dfc96931787440d9705dc8344a867040315beeea808769bd784bf47ce78590955f564d30914809b14d8b503608d573dac6dd30f63ebbab0d1fc
-EBUILD file-9999.ebuild 3241 BLAKE2B 5c6f5d8c41fe8f746a2f0f7fd49ec6a11e38fd6183663c47d8fcd76bcaa37c06aa1f02f2ef73587128f1ac2d9b41acdff3b2592a7f1207b1e2ddd9f6ad99def2 SHA512 fb006f1b742e459cf90913a72e48224d283aec77ef76865c619164612b386d26feb702d91e9d7b0ea306684a5ef373e791676d49cf250c5353192698e5b266d0
+EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
+EBUILD file-9999.ebuild 3240 BLAKE2B 09f3355bc2b9ebdc2e760ace847c02096ba7b7c8a77535a23f3109212063bbd1e8b535a76e25c19a71a90afdc13766ac1af743ca325e850427ba695c53d80e2a SHA512 10c411763893d29d31aabb52da0dc579bc0a820b1cab4d535987823d915efde8c10b1b8b622a980b8d8e2d9bebc40b13182152270a86606b69d25f44f32a7bc4
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild
index 3cf4bfbc83cd..7cc595691640 100644
--- a/sys-apps/file/file-5.38-r1.ebuild
+++ b/sys-apps/file/file-5.38-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 9a1e2fcac320..0fd7e8ca10da 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b182735fc539..a86d9de595e8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,8 +7,10 @@ DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab
 DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
 DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
 DIST fwupd-1.4.1.tar.gz 2301866 BLAKE2B 057c7cdc4449aa67540719e6b7b1f073e8b247aa80dd99cb4b1c4ebf7c368c5089ddc25200bb0a42706196e3025c21a5d09f5f507d52e5c0fc5fc6d5c1eacd46 SHA512 abec0c2d66bd7e256cefa5e0ce59bbf339ea2ffb6173671c7f6cf8893b0931c16c48c47153507bc1af3f31157dba8bddf566bba1b62b8a722fa1f50780a1f921
+DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
 EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
 EBUILD fwupd-1.3.8.ebuild 4147 BLAKE2B aba1f982b217a437d855cad900206a45509e2f6a1c102b24a1401aa8aedc113a8df1332ff13bdd052c21d5eebe1b62512a7dcbac2a135a0cea0d6daba29157a1 SHA512 d41f3455527b8bb26ae8ccbbef163269e774791c80a023ea3ac07cb3864582aedeec15448e53341430374bde74fe346cd06f23bab0cc5f793aab6337cad24eaf
 EBUILD fwupd-1.3.9-r1.ebuild 4196 BLAKE2B 40c1921df28ed69702666f33793937b6aeac82d02067423ec95076c92ebe10f7a2842a4c85a85b13d8e14e914b2106e9c4e1f50cf711d33d873933b84322d0ee SHA512 dc7d75a074887c8bdb9fa9536846d0d578ea1e4d3416eabbe97a3cb68a10be343909ef142a7d93c90fcc4506cc2ca716cc64b33a194c59e6f2b7ec778f67f6fd
 EBUILD fwupd-1.4.1.ebuild 4017 BLAKE2B eb969175d2aac3fd344f4377d0ace2e5dd79fb53563a1fc873d7c62366b7ad14e36481169bc18fb72e45bf9622665f1e6c815f353666ca665da604d04fb7d54c SHA512 f3fe7530dea6c037bf6c0563ba6740f49681d189424a23dae192a3620d91f070e42a5b97ca88d927584e1afcfbd0650a1f05dcb2c31850a952295217af038487
+EBUILD fwupd-1.4.2.ebuild 4017 BLAKE2B eb969175d2aac3fd344f4377d0ace2e5dd79fb53563a1fc873d7c62366b7ad14e36481169bc18fb72e45bf9622665f1e6c815f353666ca665da604d04fb7d54c SHA512 f3fe7530dea6c037bf6c0563ba6740f49681d189424a23dae192a3620d91f070e42a5b97ca88d927584e1afcfbd0650a1f05dcb2c31850a952295217af038487
 MISC metadata.xml 1282 BLAKE2B 1c24fd3a7c2fce83628937b30dad0a9144bfcef23688ec0ef26e61bcb82252bd0ac8d339c179ea6ff22d7f4578dfc4484d87c5f1508216bf8898b6ad6de720f3 SHA512 96ee8309fc1c3cdee219428aff411e0c68f2702488f202f749a49ec51307ca604e27cbf131908b477afc9d10ee045e53f4511369bd5fd601894e507be398ad73
diff --git a/sys-apps/fwupd/fwupd-1.4.2.ebuild b/sys-apps/fwupd/fwupd-1.4.2.ebuild
new file mode 100644
index 000000000000..fc4bbdbfe909
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.4.2.ebuild
@@ -0,0 +1,158 @@
+# 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 linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( consolekit elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection?]
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	virtual/libelf:0=
+	virtual/udev
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	elogind? ( sys-auth/elogind )
+	!minimal? (
+		>=sys-auth/polkit-0.103
+	)
+	nvme? ( sys-libs/efivar )
+	redfish? ( sys-libs/efivar )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		app-crypt/tpm2-tss
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${DEPEND}
+	sys-apps/dbus
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		$(meson_use agent)
+		$(meson_use amt plugin_amt)
+		$(meson_use consolekit)
+		$(meson_use dell plugin_dell)
+		$(meson_use elogind)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use man)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use redfish plugin_redfish)
+		$(meson_use synaptics plugin_synaptics)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi)
+		# Although our sys-apps/flashrom package now provides
+		# libflashrom.a, meson still can't find it
+		-Dplugin_flashrom="false"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+	)
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+			"${FILESDIR}"/${PN}-r1 \
+			> "${T}"/${PN} || die
+		doinitd "${T}"/${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
deleted file mode 100644
index 0653d42811b2..000000000000
--- a/sys-apps/fwupdate/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
-DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193
-EBUILD fwupdate-10.ebuild 852 BLAKE2B d81f83274f7b81c7d1e572cfb3a4b368ce609c26207a01bda54b8927e6004dc0ead9aea40e51cc6ac4913b29fdb9c17d5aee0fbe9241c0b89be38f5dc31c317e SHA512 674bc7a7f008c55114c6fc095ea3a4d2a1f12c0177c5ea689564515229c82d7fe73b33fdc659fa0b1831e69c48bebbd94dfc0a1f16bfe4198caca291120fe256
-EBUILD fwupdate-12.ebuild 876 BLAKE2B 9a9e95e35cf311d8e964cfafa9b823c80c4fcfc4b41a0d0e5f80024bc2d35e09ce94c12935eecd328614d68e4c5d37e331fcfd936ea3a4aecf870fb3a5562205 SHA512 4d2ee910120ecff4aa506717042f64fac77523f0f2a48818057f53519d3206ca8d2e95993988a6c5d884d1136738d26bf59628d0c7786071ebe6f948cb923414
-MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf
diff --git a/sys-apps/fwupdate/fwupdate-10.ebuild b/sys-apps/fwupdate/fwupdate-10.ebuild
deleted file mode 100644
index e568ed34d907..000000000000
--- a/sys-apps/fwupdate/fwupdate-10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
-HOMEPAGE="https://github.com/rhinstaller/fwupdate"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/popt
-	>=sys-libs/efivar-32-r1
-	>=sys-libs/libsmbios-2.3.3
-"
-DEPEND="
-	${RDEPEND}
-	sys-boot/gnu-efi
-"
-
-do_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		EFIDIR="gentoo" \
-		GNUEFIDIR="/usr/$(get_libdir)" \
-		"${@}"
-}
-
-src_prepare() {
-	default
-
-	# Remove -Werror
-	sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
-}
-
-src_compile() {
-	do_make
-}
-
-src_install() {
-	do_make DESTDIR="${D}" install
-}
diff --git a/sys-apps/fwupdate/fwupdate-12.ebuild b/sys-apps/fwupdate/fwupdate-12.ebuild
deleted file mode 100644
index 77dcb16f8ac6..000000000000
--- a/sys-apps/fwupdate/fwupdate-12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
-HOMEPAGE="https://github.com/rhinstaller/fwupdate"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/popt
-	>=sys-libs/efivar-32-r1
-	>=sys-libs/libsmbios-2.3.3
-"
-DEPEND="
-	${RDEPEND}
-	sys-boot/gnu-efi
-"
-
-do_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		EFIDIR="gentoo" \
-		GNUEFIDIR="/usr/$(get_libdir)" \
-		"${@}"
-}
-
-src_prepare() {
-	default
-
-	# Remove -Werror
-	sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
-}
-
-src_compile() {
-	do_make
-}
-
-src_install() {
-	do_make DESTDIR="${D}" install
-	keepdir /var/lib/${PN}
-}
diff --git a/sys-apps/fwupdate/metadata.xml b/sys-apps/fwupdate/metadata.xml
deleted file mode 100644
index ce6167e42309..000000000000
--- a/sys-apps/fwupdate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rhinstaller/fwupdate</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index ea5b29de9351..04fe541c3933 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -2,6 +2,6 @@ DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
-EBUILD gawk-5.0.1.ebuild 2231 BLAKE2B 337e5fc22b6eb3e0854df63663a1a1f3127af4b2ee9b4ef88e75ab32a6eaacc6575606e46ee3549e64f859e442f3934a1479b2e3774835787108fc96a6ef8549 SHA512 6f2c3d50656d342de6fb543f256764b43ee9217e99ca94c4378e312a5202ee3138104cbc509045b593c6acdc8e2eca6d735480c7e9ef5f1fb7c9b8e55addfda1
+EBUILD gawk-5.0.1.ebuild 2229 BLAKE2B be0558fdbd6c8c4a365ba23dfccaa2a27dd80984bcc6605f9c5a2a2770bf0b30719e48d2325660488627150a2eb864e64ffd5c4ea0138c2d0dd0763e628897c1 SHA512 f287ba7bef4d196ef5def63b086f32769301bbd62d2a49fbdd861079b1df85e2d155058e5aec1ee14706202e36f2a64ca6114019cdf662ff0e22e617af59c278
 EBUILD gawk-5.1.0.ebuild 2280 BLAKE2B 29352fd90acca40f4986842737909e282d1d082685e49ba35c125ccc0d30c575ed439e833100d3673d398c9c74b8c6955137d03e9afa93ceb605930e1aed6f54 SHA512 6249b492dc57bdbf408395711dabd0a1787372803d81b5852a78599dc1fba228a2c8acd2ca43862be17bdbd95829213c7ab1702061b0a4ef33cf20ebb9397e95
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index 6ee180218e5e..b44a5513e78b 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index b2b8bc2cb4a0..a18def31d1ed 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2792 BLAKE2B 0319d0b38341ca672e408b4c5ff2d92e71c2d6adcd0f282a1e128328e3af485f74737ca7b7d5b48ab227a04911bbabe153671dd548e3af2dd84924bc77aa0cdb SHA512 8903afe4bbc5ddbce88b85f3098c2d0172aee6b2da98196b7bf913eedcde939720b2fb0d16276817097bc3d1da6d350e38599bb452d0f9d1165539a76ecb9d33
 EBUILD groff-1.22.3.ebuild 2506 BLAKE2B c72c5bbfb1fc6b733be04ca30862c42367b67417547b602f955807e5ad1ea5af8535bdf8188b68949d7f1a59e07427ff17011b8a45454f3fe9fc50436f97f996 SHA512 b79e10a91f4a4af83bb24f39a7265dd72a986d3a1aa400e2829b7a5b4fc4beca1b9dcf9099f5c263260ef15da006eaa7f5e2b0ecf91dd94a004c24ee24fcc550
-EBUILD groff-1.22.4.ebuild 2563 BLAKE2B 6dca932b9639506937cf72efd663980e88fef36e8ff3c2fc643ab4c08c763d2699fbce431a2c5ceadb704d26ad9d55ef485c54b675fce93eea64e74c76a92e97 SHA512 91b41919c01e17dac55dfea6d40d818cab1d674f9cf927a24393c0c77dbe050b69f23375aba16a57d2f07d2b80e12956673084a56e60b19df8faa45bfd26482e
+EBUILD groff-1.22.4.ebuild 2559 BLAKE2B 7893ad0aa77e5313e6b3418f8bbf8b63aae23f04225b45d99b52962df833b2286bb18c3ee2f91c3fb51d9b64da334384ffe1eb78f4ae93a4175b023b1c5f6aa1 SHA512 b4230a42c708f646e0ca2f9064265f6643b04d8bd8bf13ea84344bea9d9a23ae2813b1bb734a4fa767192a008fcddd6ab9fcafea68d8b24c3171987e8c844621
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 79613e8cf453..85c6b1072337 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index f2dfb3e9e022..d8501ce08b12 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -8,5 +8,5 @@ EBUILD hwloc-1.11.10.ebuild 2197 BLAKE2B 2cc8b6519ea866167cbdd58145472354c8859da
 EBUILD hwloc-1.11.13.ebuild 2178 BLAKE2B 293f6b2a4235d0d52fd05b0a301b0aba23bd544871cbab2b74cc2298ab4154efe509a0789e7533a66a8a82b335ffa3bf642082b8d3cf0f07eff40751f20a9153 SHA512 985d07ca0b35a9510273d490b1a81a0f874aa45182b9acd62767e245e1a0d8f68063c8d1279f12349c98f05665d62a6d4578aeea4e6a558e6068891267122a36
 EBUILD hwloc-1.11.2-r1.ebuild 2142 BLAKE2B c0276f7d2e8500896e855958f173e08cfb87242570a60d46de7c2e575d7b94349505b5a5377bd2c805fee60c4a9be29cc6d8aff4f034afe8b06e0e3c9b7bde85 SHA512 78faaccd2f66eccca1e4c72603786c9161e43b6a76f11cf6dd01b292e67a116ff1649076494065713d0b52b123495982efef9110d35d7aff32e34d83ca81c0b3
 EBUILD hwloc-2.0.4.ebuild 2049 BLAKE2B c243ba4020853c7c0be9d7a8e2cd5b8fa9889b5e8d7c15bdf2fe24fb72124704be6c8d0484fd33d600e2cb43bfb5e2f3116aa312e8e8f98743b537c0ab63d80b SHA512 95b962abb0200bc1f51867734e80cb0d8caf959655fcc757dfcf1865721f69797adfe53c1e06d3fedfd840f903c97b6a0537b1be438b8422cb6ecfa5625bf672
-EBUILD hwloc-2.1.0.ebuild 2422 BLAKE2B a0956a2487709b564c4b31f7313469a3ee48019304465a53871f3180871b11ce10ab3001a1fc2ef0e48de2f1e422bf4f2068b844360c0c627a331230774aa714 SHA512 a09771460a4143a20f758ea6f8d5ce44cd59cd1c1ae177c4215f6c440f971c6c5a39e65e21a31fc6ad78e25741ef40e4239d3c5502a1fd69f229f0c295b9921e
+EBUILD hwloc-2.1.0.ebuild 2424 BLAKE2B 3127b3a5a50a992e5a8cba110c03c187dfd760b2dc36dcbbc9227b34ae7ec3d362fc7bcee73aa1d1beba49f56533b0c27698e70f01317444824a9914b5a2fba7 SHA512 156f66124f657714a26cec0aad2673e51722e9978c0fa427e2b06143c3d5fe9475b6ff52f3f58e783b5aeae3a8600bbb736741293b889f2a715ae8c96b3089b2
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild
index ebd907937810..7c50207b2780 100644
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -78,6 +78,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	default
-	systemd_dounit "${D}/usr/share/hwloc/hwloc-dump-hwdata.service"
-	find "${D}" -name '*.la' -delete || die
+	systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 6be14c7c0b64..1714252e6e6d 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -6,5 +6,5 @@ DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d7
 DIST ipmitool_1.8.17-1.debian.tar.xz 18252 BLAKE2B 6219d81b6b54354e8e412850fc1ee673e2dead153076d55c67fad0518e7230642934a52ba0abea29d8b1f47eb7beef10cbe25a7b8a4df158d4b44b1f1e229f4d SHA512 e1133262020e8fabe47e7aa308956078bc9fb3bb7033413230f1cf76aca1d4733bac64e52039365f24fe54a1bf8e271071bdaa1722720fca62f1c9e8888777a8
 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
 EBUILD ipmitool-1.8.17-r1.ebuild 2443 BLAKE2B 4204805a6f363de5f658168821d8293b20ec61f68447c31c3448c28701e6246bc0cff63a78acbe655bb0ae529a637dda89b917b2f9a949ed43630f248990c97c SHA512 8824e25c00e9b9406fddec2caa638fabbcc1a1d8207a7784e2b6bf7d8c59bc6a668edeaf199a3a347d4be2e046b4efc5ab5198c242fdf9395ee825d6e2df8f2d
-EBUILD ipmitool-1.8.18-r1.ebuild 2562 BLAKE2B f43bd010f7ed3630404d34951729923df9f5c125f4d6b567d061929f15ffeebba9aa8c31ce0933393137f0f588d3d969ba2a0e03594f5e7d7767da134b41ff5b SHA512 fa0e7dd14d49aca336212089ab780ce68bc040e37a156a5aa73e3f37d8e2ba61a0907a6237adfe4f44a33a23595a8d2b6087f31d99ec31a30dd30711292089e3
+EBUILD ipmitool-1.8.18-r1.ebuild 2569 BLAKE2B f72611c58ca80d27154b4ea8089538e31f4a86019409ee437da202fbc99e87b32194a48cd7340da49167b3d018a7bdf4ed568f4fb4cc45fa878081da3aa738d3 SHA512 d954614117f756f65553c51791a9a152129782142a61b846b213fff619fdb6ce75338a09a5a33eabb8b10da719253809be7dacc21a105e0d0daca8a38947e282
 MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
index 925d59f5d912..3838cd1bd338 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-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=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openipmi static"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86"
+KEYWORDS="amd64 hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 228111dbc8d4..b65df2beef70 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,11 +1,9 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe.sh 8044 BLAKE2B 9ea7f314c852dee57f9745ee04f4d0779c2e22a138ee9ef479199cc5838cc5edfb08a1a1408ce12f1cf668e4b563abba24fa4ea2ea4abaa1c85a2d3cc3ed608a SHA512 e8b406127f3af3a4c3f9f37c4f165e334311a8da251c5a686b6bfbc24c2cbb202f27aaca5c7b426cc29036b48d944e6be5cbec2839e6e2712aaeb16c5d4522e6
 DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
-DIST less-557.tar.gz 335142 BLAKE2B 1c8645d70b1eb6d6d7f88c62ae77cce64e39262b32608cc4a27c0c8a79a2f84506ae41f76bd8eceeac8d294192f8d9006b7ab503482b2a4cdd6a2837ab187851 SHA512 5d82942d90c098fe81bf070e77c5d388eef83eaf4f4c48bc1ea6c0f718b04d09cc1071448e0f4cdf443872842d8ace9339036e77ee8a0baf6f4d02e91e87848b
-DIST less-560.tar.gz 335124 BLAKE2B e65ad2f0e99b633b8be59027b1b97cf3613ae4d2d1dfa2ca9ebbee71bdbe07fcee127f2554122789726def8a5137cf76a850a4767f005b168be714fe11f0da9d SHA512 8dd39e7bdf8274548e70d27ba1ac863c5957646c8fdd708fd87bffb204149252e4bbd8839969b507ba34f2d2d712bd0689d4fd5fb944bec1e40885bbcf06f40d
 DIST less-561.tar.gz 335311 BLAKE2B a319b835d8151a5cd69a6b9ea75455231bd822bf2312cbaa5214f8508ba2bbba2d80e3d383adb771e6c5ffa21f86e0e5c2aa999a828b340d3b3ddbd3adb9fe59 SHA512 b06cd8013a7774ae3492ba1c80b94f6aab8c07d4694bb3f474187a9aef369eab81c1e3e5d33bcdca305be155a9c8292e65d062354111c6de8cecd174d5a8a667
+DIST less-562.tar.gz 335444 BLAKE2B 4830673d17594aea7424ee88b82bc2e073275a77ed39c067c032a0b79b0d15f8c0d97f98381a57192e985054cd04b3a824ef6c3e6ef796885a9677681a4cb109 SHA512 c9a0f43da0fcdb515e5d4f56a666fa7c8b12d52fd5a1cd4f6cc5f79133376400b0ef24a206c0cf5fd3558fba9a8055f219038bad8c3dadf0504ea96c419c4573
 EBUILD less-551.ebuild 1392 BLAKE2B a81cb5c09b972404d6893a020f18c6f6ed592d28423d7ddb691dfdda3b7f241bb520a420e45e6557c374695cad57ab52c3193f9098c4a9a4b67e80911c3dbf35 SHA512 68e995a4a03c032ee2d1a183326050610e56f081cf7a7f2e71921caa149449f2f1eaafc3319dbd9ca71a0e22f589101c8bbcb9aa317c928c5457e3ae86514d46
-EBUILD less-557.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
-EBUILD less-560.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
 EBUILD less-561.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
+EBUILD less-562.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/less-560.ebuild b/sys-apps/less/less-560.ebuild
deleted file mode 100644
index 375e2585ca5b..000000000000
--- a/sys-apps/less/less-560.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-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"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-557.ebuild b/sys-apps/less/less-562.ebuild
index 375e2585ca5b..375e2585ca5b 100644
--- a/sys-apps/less/less-557.ebuild
+++ b/sys-apps/less/less-562.ebuild
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index f88f7b468fee..765695320bf0 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,3 +1,5 @@
 DIST lsvpd-1.7.10.tar.gz 89862 BLAKE2B a2fa6f85822313b5cf17ec9207ddd533ffb1cb4a3ee2e32416d6b646930f8499c3d8994ab6cd21b1d4d01be1c32f13e2bd1206cc073bbcbaf8cb9722993a1510 SHA512 0ee9b8329e9ea7eac6b502051a5ecc5af28642aa3f14af9cecd0217ea6637a548eaeab2e5631534041dfd849701e0905a0618b1ab62162b9af493ab0f8ad7ff4
+DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
 EBUILD lsvpd-1.7.10.ebuild 574 BLAKE2B 20b45740c87d91ba4393af9841b77bb41d624a416ca82cb04315f8319f5788535d76c189e340bd167988d4038922944d11d2438502a6859c7f2c90390149875b SHA512 2575ab1d7c815bf1a2fe10334cca7bf52c454021fe30f96dd064372bbc1c79e7efdfdb9646e7636462c441c11978892a67e832a4bc6ba38e96636ebaca133912
+EBUILD lsvpd-1.7.11.ebuild 575 BLAKE2B c5f93a9b8e866ab6c07ab716f37aaa571c27a5bf9606c198fdf8107ea8bcc9936e3d0748f116d8bd1b8da32ba4c26093efa159681aa0aae0bfee0785e2ca9309 SHA512 8ca6d60982f851c230f9a95b4f6caff791af16f6bc9e9bf7f9eed5062bd14cf1462705f55abfdefefd9930b1436befd7489839dbd3b63cfeac01d383d5b27b7a
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild b/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
new file mode 100644
index 000000000000..8dfb6ff3bd44
--- /dev/null
+++ b/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
+HOMEPAGE="https://github.com/power-ras/lsvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	sys-apps/sg3_utils
+	sys-libs/librtas
+	sys-libs/libvpd
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+BDEPEND=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 1e8e3708ebf8..22d2adb4710e 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,6 @@
-DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
 DIST man-pages-5.06.tar.xz 1703140 BLAKE2B ff123efe4534321d0646e1ce275ec9e9543f4c35d0e2ee89354181f7ac5def3ca8fc403847b19222179b37604064ad2f5453d611bc25df5460bdf0bfb86f0b5a SHA512 2d321ae88be662712293e9b054e5cec3d817836fc154924cbd6a0b759992463a586ec01dc3292fcee6d8146c60e63ef505b223fd955ce71fcbd8760cc60512ed
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.04.ebuild 1637 BLAKE2B aa289c279045d4e50f5e6bbd9b0c94d49ca2b3fe2e70b38f6f2b53169fda4b1f3c96e4d585c0ecbce87770a91614ab7981bacd1de844b74abf3dcbdb1c091282 SHA512 c18d2bda790107c5497e6b16b2bbadac150f17746b6d89e7238312d3c2e983101dfc31ee441c437c71d37f8499f097b6b57a3c62ea5f1e99a68737c5c5c0a72e
-EBUILD man-pages-5.05-r2.ebuild 1727 BLAKE2B 12e153927e15fdfbdad8b443d4e99469e98d214730083a741e200280c76c19124e10846542793d46529882fc8504f18e818cc317026e8a798299933d823938e7 SHA512 2401e62218595541ea8a6e19b8a814d9f045366dac64d79c094bb8af6ca07d80abe3b27962fc3b386c45af888b94b7adaf070c852fc82c1fad70998b56828fbc
-EBUILD man-pages-5.06.ebuild 1740 BLAKE2B c9ad16d149f63fb02dce7be3059afd2d138bc5ca8c3012287816fb27e52ae1e56b74036d79590d104feb64323597d8d9d3d5c71e4b9ced28528740d281477177 SHA512 e272b2bfc376207206b8eb36c91ae14c867cecfd6cd929e1cebf9a1155018b0528f3c35e003e7a9e8e0966e049db4c5f251d8d120883cdb5f6b010a9e5fd8dbf
+EBUILD man-pages-5.05-r2.ebuild 1611 BLAKE2B 8821b0fa219762e01c49131b98176268840ad41f5911ec553f28a93e20f01aa20cce9261a6e5c506c91bad77bd6a74a0f1e93ab1e70b75304f6b217301774f7a SHA512 2d4af5da5306a64f3c80e40a11a343a461070d95218f97c2a54f29a829671b2ff7f57d8330ca1c5ba7cb1d904ae08894a189ee380b6feeba8f306624b54a211f
+EBUILD man-pages-5.06.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
deleted file mode 100644
index 42af68e52b59..000000000000
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.05-r2.ebuild b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
index a514eeede3c8..fe9e0aa37627 100644
--- a/sys-apps/man-pages/man-pages-5.05-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
@@ -24,12 +24,12 @@ RDEPEND="virtual/man
 	!<sys-apps/keyutils-1.5.9-r4
 	!<dev-libs/libbsd-0.8.3-r1"
 PDEPEND="
-	l10n_de? ( || ( app-i18n/man-pages-l10n[l10n_de] app-i18n/man-pages-de ) )
-	l10n_fr? ( || ( app-i18n/man-pages-l10n[l10n_fr] app-i18n/man-pages-fr ) )
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
 	l10n_it? ( app-i18n/man-pages-it )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( || ( app-i18n/man-pages-l10n[l10n_nl] app-i18n/man-pages-nl ) )
-	l10n_pl? ( || ( app-i18n/man-pages-l10n[l10n_pl] app-i18n/man-pages-pl ) )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	sys-apps/man-pages-posix"
diff --git a/sys-apps/man-pages/man-pages-5.06.ebuild b/sys-apps/man-pages/man-pages-5.06.ebuild
index 1b3edb48e843..c17bf4553435 100644
--- a/sys-apps/man-pages/man-pages-5.06.ebuild
+++ b/sys-apps/man-pages/man-pages-5.06.ebuild
@@ -26,12 +26,12 @@ RDEPEND="
 	!<dev-libs/libbsd-0.8.3-r1
 "
 PDEPEND="
-	l10n_de? ( || ( app-i18n/man-pages-l10n[l10n_de] app-i18n/man-pages-de ) )
-	l10n_fr? ( || ( app-i18n/man-pages-l10n[l10n_fr] app-i18n/man-pages-fr ) )
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
 	l10n_it? ( app-i18n/man-pages-it )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( || ( app-i18n/man-pages-l10n[l10n_nl] app-i18n/man-pages-nl ) )
-	l10n_pl? ( || ( app-i18n/man-pages-l10n[l10n_pl] app-i18n/man-pages-pl ) )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	sys-apps/man-pages-posix
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index dd31e697ccab..a9d49c5b5fcf 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,4 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r2.ebuild 788 BLAKE2B e5a568a58ccff089e72c7759ca6c25d07abb1886f6216f43db832a74f63e03a167d4dcf3ce5b428080fc78efd10dc230df390efd5a05b168d4726009ce78b221 SHA512 cb50d54fb602d03446f63debd83aeae6523f273a96ee85545baac09a6739bd6435ddd85b2815a18eb15093ca9fd8d892b82c76287ca761672e0aebeefc7ba3ac
-EBUILD onerng-3.6-r3.ebuild 828 BLAKE2B 2fb2f83c3bf220c2b1b1807f8797147025a18acc2aba5fb49bdf0bd176f25f566bb95bbf4d002f38be9f133c5de009d6cea35c96836ec297ae6dfbd0143530bc SHA512 8bf54ecb21e7d5f8045ef810878ba9fa841734bb9772e3e9e8d05d66190612fb65523d829b0e933f99f5190a468db20decf32784db45bf0c4e92c7594b69652c
+EBUILD onerng-3.6-r3.ebuild 826 BLAKE2B 2e5ce15810e7244d5c1205c990a81f1e7b375fa471eb0aa8d703171dc437b85d03e8cd389987cfe19631e08cfdaa18fda3c34298afc15369419174b6273e592e SHA512 1235cb0306d1815652c5b6f5559f78718057898692e02305aa50dd33d1f35a3f8bf8732808fb883b71c8a2fb28ab4d186ccbe3a592d3474b5dfbf83eaf37aeb3
 MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/onerng-3.6-r2.ebuild b/sys-apps/onerng/onerng-3.6-r2.ebuild
deleted file mode 100644
index 4c9775f0808e..000000000000
--- a/sys-apps/onerng/onerng-3.6-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-r1 udev
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
-HOMEPAGE="https://www.onerng.info/"
-SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="virtual/udev"
-
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	app-crypt/gnupg
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	sys-apps/rng-tools
-	sys-process/at
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/onerng/onerng-3.6-r3.ebuild b/sys-apps/onerng/onerng-3.6-r3.ebuild
index 3ec2cfa3ec6a..391e3ca0b0cf 100644
--- a/sys-apps/onerng/onerng-3.6-r3.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.t
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index 0ec60e19469b..fd0f4d3c8f64 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,7 +1,3 @@
-DIST paxctl-0.7.tar.bz2 7642 BLAKE2B fe9dbf6a673e677556b7667a036cdb5243c064fb9a10dda49783b408ed66d6bb072c478b529fa58cd2795b19c3128d6ae83c4aa4f11e19fd835c16a7df1aa4ad SHA512 d715d7466c5d5b402a7b6c44257b959c81234b8b72dc3bad4ad1080f66da784b348e73fadd3b2072ddec6c6b08f042a35cbf9d63cb890ef9efceb1e2e8d56d0a
-DIST paxctl-0.8.tar.gz 8027 BLAKE2B 3d2e1b22b3bbe0912c2b3ab4ae864c9eb01e949349c382b4b395983f5787ffb6b6b5681329c81aa82231e8b779badf0c46a41cb43b967eef48892488b957d736 SHA512 9357601a96a7780bf900621e8b88e8e7cd323159084f62f30cd6967319fffabe08efff3596612fd05a1daf639610bb15d998f4a954c980ab4f45c9a0cc80037c
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.7-r2.ebuild 771 BLAKE2B 7d2c897fb3d6c19da709e4047a28fc782b14f11f628e0c2f9affec41e3d86caa2c4632598c7c7b3758b34076acf42c766e5c15c3a926e925305348a11f46ae5e SHA512 e3975705662756ac38d46abd77e0d0df149a1b1f47c6a3635e48b0896ef3c41d02a32c99f9daf33b24d47020088060c034979ca26b19518919f158dceb80fc0d
-EBUILD paxctl-0.8.ebuild 777 BLAKE2B 75d5d0f57cd14bfb70c92858efc37e97bd8c0424b911aa336ed759d878e8bed4ce36395c124021a88c9d190ea16267da750f9cfe75a257bcfc8f1f697f0480f6 SHA512 032f0075c87f4e9b524cc00373b8f9d26cb7b05601c7034fae125e432b719ed4c463e5ac49d1f40d53f964a5380ed859db27638f83c6c3fed1b4939c21902d0f
 EBUILD paxctl-0.9.ebuild 776 BLAKE2B cdb6fe84ef6686817c1cfab7ed52f590d2acff183420bf35568a0500bc9cd15ce34ba3ad71b0ab94bd0575257a4aeeb72d0fdc0e812adf8192063d21a8fdc3d0 SHA512 09e3beaaa717da9fdbe917f3f4ddc2a71b1e93596ea7a378cd6cfee1014d4191d01e07c9357ef87f3eaf484af1d96635a2a735ccaeb5538f1d41e9fdbb0a287a
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.7-r2.ebuild b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
deleted file mode 100644
index 66aaa087a942..000000000000
--- a/sys-apps/paxctl/paxctl-0.7-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries"
-HOMEPAGE="https://pax.grsecurity.net/"
-SRC_URI="https://pax.grsecurity.net/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-devel/binutils-2.14.90.0.8-r1"
-RDEPEND=""
-
-src_prepare() {
-	sed \
-		"s:--owner 0 --group 0::g" \
-		-i Makefile || die
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc README ChangeLog
-}
diff --git a/sys-apps/paxctl/paxctl-0.8.ebuild b/sys-apps/paxctl/paxctl-0.8.ebuild
deleted file mode 100644
index 6727771993f2..000000000000
--- a/sys-apps/paxctl/paxctl-0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries"
-HOMEPAGE="https://pax.grsecurity.net"
-SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-devel/binutils-2.14.90.0.8-r1"
-RDEPEND=""
-
-src_prepare() {
-	sed \
-		"s:--owner 0 --group 0::g" \
-		-i Makefile || die
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc README ChangeLog
-}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 224fcf5bb915..4bb69fd87e57 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcore-0.10.12.tar.gz 646922 BLAKE2B f3251b1a0d773e83d60f15598c2c5679a48a1e1dd81b82956ffb26ef72c25296903d64deeb0e91d95ae26832d0e08e3cdfcb68b95bbcd87acf8ed448a4f4ae56 SHA512 f6f900fc7f77a683c398c874c51eddb387f9aed572d5fce38f4856faa71f4f8e870b1bc276a87f15967733fa6ec7c8345f2d6b777897694537fa1e9165b1433c
-EBUILD pkgcore-0.10.12.ebuild 1092 BLAKE2B 4947012a35c928313683a1adf85ba5b91b69731e0b0716556428cd49dffc64789e159aabec670021d639e7e1c005636d490470569f39adb490f6c34fbba92209 SHA512 2295aa4e657203b3aa7c4c382f466a5a637cc8fa4ddcc3445b5ee2a1be0e54432508c361435d595b43629e427ce4d9381426ec72841d6d0df5f085fe9a38a2f7
-EBUILD pkgcore-9999.ebuild 1085 BLAKE2B 26919e33c94f45462c9c4d832eb885c8382cd861ed781e4171f10ece630e81265e23ce96c46f86e52805134131fd83f725575850b99413bf6a0f07ae6d40f268 SHA512 caba4548311f5d6a03bd1a6e08c203682ebeab2de62141982316ebf5b6b9cb33d137abe1833ad33b89c110df47351be390f9877ea423710c8c40587352e40377
+EBUILD pkgcore-0.10.12.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
+EBUILD pkgcore-9999.ebuild 1084 BLAKE2B 31eaaa22bfc8d1e25c87f41355da880725604fb4d1053e02c208f93b91777bc98575e8437dd295d231d8ac100d987154dc28755ce70023927481e632f5d2a6d0 SHA512 cad4a1f868b36237eaaf778b82e5c68a4562137474d16335868ae0bdde39dedffab9c161c4caf7e8dcb9708307370550f9fbdc618cb7b31c89c7e8f37246c51f
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
index e7082921ab08..4d3887960e30 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 7b1913d802f0..66a8a5020abd 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dcc09dd46cbd..92db9b05407d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
+DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
-DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
-EBUILD portage-2.3.89-r3.ebuild 9000 BLAKE2B 4d4b6bffebc723c1156d4b3028fb9bb5d05b4562654e301977690fa25588e74b4724be4696d70bd83484f2a9919985559b0ab7a84ceb02f9f11180a5221abecb SHA512 82212fccbaeb1d2da43d8e5c284fbbf12bf5834e5aeb98813587321376db076bafda3c84b11a031157737c302d000e77b0552fae762ce14bae305e449d2b388e
+EBUILD portage-2.3.100.ebuild 8284 BLAKE2B 4b5f6610208d82ed8848e7825412bd147006ea49f91f2c9b4e0f09bc17089318eea1ed9e1f06cd5205577aaf6918ccfc06faa1f7bf330f5679d1608df7f7ecf2 SHA512 5be14340a32f932eb81c97d7487ee29e81ece0022ae1a78e56ad35e594ec84ecafc6f7dff350ab5bd42f4707f44a2c4c39711f23e55cbb1f887bf71f5d8df662
 EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
-EBUILD portage-9999.ebuild 7510 BLAKE2B ac3764a4697c9ac3115dcc23ba882c54c74c20d55664a7d8b76b7e5e278656601203e23e2885a5a57cba4b9f9d815c13c2d2d55cfe5bd43b1ff56b1dd6c465bf SHA512 eb289c954c3df5809f029c898536906ab105e6260f7188c4d9716bbe69da4d6f7f793a69a527b9879692296142bbcd22f35cc3764bc768dc11291a45b4289700
-MISC metadata.xml 1570 BLAKE2B 092b2d6e4e584c37e92b6b38c6caee21b5fa63095d7738c6fbd77acd58a7055233fae448a73a865bd2bbc16e8457ccbc3df4b4115d0056ea4ffa1bc17fe3fe86 SHA512 69a3cf339eb01a4e4b51cc0e77910c10fa1cb6983599dcbe049970ac98999873b350cb22d9b389fce9b99a5297f1bc968e28b05465b6cacb602fac0feb547756
+EBUILD portage-9999.ebuild 7423 BLAKE2B ea03765f419e9450349cb5cf956f6f86f73a2ecdd95be109edee4713de5d57fb38f1da502f6d5aa0ba3bcea28ee1985efcb252a40af83982aa36fcfecfb92c73 SHA512 4494b11c180586cf6b1f268a2f9c54926ad57a4d41f74841b2644026ce8f18b8044ec5bd0048678bcd3a8c97cb1a9a1b6c5b63cbb637c2af948fa6fcd13ac0d7
+MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 0f9d932ce5e7..062dafe62481 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -12,7 +12,6 @@
   </maintainer>
   <use>
     <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
-    <flag name="binpkg-zstd">Use zstd compression with creating binary packages.</flag>
     <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
     <flag name="ipc">Use inter-process communication between portage and
         running ebuilds.
diff --git a/sys-apps/portage/portage-2.3.89-r3.ebuild b/sys-apps/portage/portage-2.3.100.ebuild
index 210f4409e404..9f6aecbb7dcc 100644
--- a/sys-apps/portage/portage-2.3.89-r3.ebuild
+++ b/sys-apps/portage/portage-2.3.100.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 epatch linux-info systemd prefix
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -27,15 +27,12 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 		dev-python/sphinx-epytext
 	)"
 # Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	!build? (
@@ -81,11 +78,10 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
 
 pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
 
 	check_extra_config
 }
@@ -93,14 +89,6 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	epatch "${DISTDIR}/portage-2.3.89-bug-718578.patch"
-
-	# Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400.
-	sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die
-
-	# Apply 5570a96ddc859851036035baa4da65df2daa51a0 for bug 700830.
-	sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die
-
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
@@ -250,6 +238,10 @@ pkg_preinst() {
 		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
 	# portage:portage to root:root which happens after src_install.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f5da3ae281b4..4c546564cf0c 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 git-r3 linux-info systemd prefix
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="apidoc binpkg-zstd build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -32,6 +32,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	!build? (
@@ -53,7 +54,6 @@ RDEPEND="
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
 	) )
-	binpkg-zstd? ( app-arch/zstd )
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
 	!build? (
@@ -115,12 +115,6 @@ python_prepare_all() {
 			|| die "failed to append to make.globals"
 	fi
 
-	if use binpkg-zstd ; then
-		einfo "Adding BINGPKG_COMPRESS=\"zstd\" to make.globals ..."
-		echo -e '\nBINGPKG_COMPRESS="zstd"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
 	if use build || ! use rsync-verify; then
 		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
 			-i cnf/repos.conf || die "sed failed"
@@ -238,6 +232,10 @@ pkg_preinst() {
 		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
 	# portage:portage to root:root which happens after src_install.
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 42c1f490816c..5e9d93ef9e0f 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,4 +1,7 @@
+AUX Makefile.am 70 BLAKE2B 9c2735d35e8a0c707d5fefd6721c5a8678266b64e0fa157e3ebac62982289558fd9bdd2e1c225ac527654154917bd6e0f088c9ca57d2cef8030463ffe486f97e SHA512 8c10ca443aa6cef485e1ffd2e50195bf0c8be9ced5c94342b2a04bc5658521fd5c5fe440139de9d2603780dfd69db1cae9feef15a4956098212e6b0fdd60bebb
+AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0c5f42f1ec03c490f400df0bc381c87c006316cb00a1687dd4dd5d83471c0699266cf23a727788 SHA512 ae8a75d3a37cb33fa8958f2de48549b99fc0b6f5c15fab8d7b9478e38e0dbd6d31e4bbdc876a50d52598d8b7964a544c0eb2e4677b3b32e7034acab98d8d6fd7
+AUX prctl-1.6-configure.in.patch 312 BLAKE2B c4fd576e1d4c42ffb4cc97cc24cea1f2d629a147b03a96f273a99a292a46615714415ad3902ef0f553713cd5de50d00a5498b8435e82de9f0ac78ba12889bd7c SHA512 fb67287f072516542822be2c267a2fb7a089546fd79fc6f26c67ede4e4b8db40e11d5594c3392a42df455194df4d674639263783954172b975e1f78a0195e034
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
-EBUILD prctl-1.6.ebuild 595 BLAKE2B e4744b2d95c77ae908cfda020b20628f74494ad51e602c088a22eab63ac2db0d3638df1b32f7f78dbfde242bf161903943499d5b7dff4950731dc78872c54506 SHA512 0bd11b66d295562bd5db9ebe70c4779dc6f9781f0df194547bbb5a25a895db6d8a868cd6b19ac72a7fc6d4535557ae16d1e248fd48264724bd9d6f4fc42a9ce8
+EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
 MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
diff --git a/sys-apps/prctl/files/Makefile.am b/sys-apps/prctl/files/Makefile.am
new file mode 100644
index 000000000000..aff321ed0482
--- /dev/null
+++ b/sys-apps/prctl/files/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS  = prctl
+prctl_SOURCES = prctl.c
+man_MANS      = prctl.1
diff --git a/sys-apps/prctl/files/configure.ac b/sys-apps/prctl/files/configure.ac
new file mode 100644
index 000000000000..d29ea9dd2745
--- /dev/null
+++ b/sys-apps/prctl/files/configure.ac
@@ -0,0 +1,13 @@
+AC_INIT([prctl], [1.6])
+AC_CONFIG_SRCDIR([prctl.c])
+AM_INIT_AUTOMAKE([foreign])
+
+AC_PROG_CC
+
+AC_HEADER_STDC
+AC_CHECK_HEADERS(unistd.h)
+
+AC_CHECK_FUNCS(strerror)
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/sys-apps/prctl/files/prctl-1.6-configure.in.patch b/sys-apps/prctl/files/prctl-1.6-configure.in.patch
new file mode 100644
index 000000000000..492733eb97e9
--- /dev/null
+++ b/sys-apps/prctl/files/prctl-1.6-configure.in.patch
@@ -0,0 +1,20 @@
+Restored configure.in based on tarball's configure
+--- /dev/null
++++ b/configure.in
+@@ -0,0 +1,16 @@
++AC_INIT(prctl.c)
++
++AC_PROG_LN_S
++AC_PROG_CC
++AC_PROG_CPP
++AC_PROG_INSTALL
++
++
++AC_HEADER_STDC
++AC_CHECK_HEADERS(unistd.h)
++
++
++AC_CHECK_FUNCS(strerror)
++AC_SUBST(ASCPP)
++AC_SUBST(INSTALL)
++AC_OUTPUT(Makefile)
diff --git a/sys-apps/prctl/prctl-1.6.ebuild b/sys-apps/prctl/prctl-1.6-r1.ebuild
index 44642146eb72..419cae89d00f 100644
--- a/sys-apps/prctl/prctl-1.6.ebuild
+++ b/sys-apps/prctl/prctl-1.6-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs
+EAPI=7
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Tool to query and modify process behavior"
 HOMEPAGE="https://sourceforge.net/projects/prctl/"
@@ -14,16 +15,15 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="sys-apps/groff"
+DEPEND=""
 
-PATCHES=("${FILESDIR}"/${P}-no-implicits.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-no-implicits.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
+src_prepare() {
+	default
 
-src_install() {
-	dobin prctl
-	doman prctl.1
-	dodoc ChangeLog
+	cp "${FILESDIR}"/{Makefile.am,configure.ac} ./ || die
+	eautoreconf
 }
diff --git a/sys-apps/proot/Manifest b/sys-apps/proot/Manifest
index b7f2e80247b9..932d81dd5a7a 100644
--- a/sys-apps/proot/Manifest
+++ b/sys-apps/proot/Manifest
@@ -2,5 +2,5 @@ AUX proot-2.3.1-lib-paths-fix.patch 704 BLAKE2B 2ec5d90122914299dd892001a2b100b7
 AUX proot-5.1.0-loader.patch 8308 BLAKE2B 097a5a3dbf46160a940acf194004443529b720fd8d323bb39057263cb294905e729f0d441a80bc52427e1108a9c1c4fe7dea7e84d39064258d98a3e832522ae0 SHA512 6c3018a4b44149260f2d9f9b8f892f972c0f85482fdc6b7d2858ab6ad16fdc68a9ea619dbcb80c1cb7b4a6d0af2b90329b4560f44baaf3fae29f3c624966ef12
 AUX proot-5.1.0-makefile.patch 779 BLAKE2B a70e16c8f61501253adcd4cb40f69e315548d4394828af537c646fd46878ec75a5f3d24270458a1dfcb9bc70c2468efbcc6e629f848172a678fea27e9f4a5e2c SHA512 3ee5566e2209e0c3cc12ba9dbbbbc93d0080e66039aacbdc3c30974acf5380d4f855bee81a49976ea9c0a67f904456104a2d18777e5c0c10f530debae6e42df7
 DIST proot-5.1.0.tar.gz 253251 BLAKE2B 8dc147d6c6ee303baf0c86f2fa4a8c17a58e76d9da9432635fc70ee06a65aa748ad617735012a1a18a520775fbe38c2264dcccefb681e8e829a5e7e1ddb05cca SHA512 26be26d405a8bcbe94377c3e9c18a571e4b61e3074f0716b0db3517d147d9d4a07c80f7312171cf9580ac7748e72e688efaf1b8e4a0ca3bfc31c802aa351346f
-EBUILD proot-5.1.0-r2.ebuild 1930 BLAKE2B d792c4f8550109346c9d54c01c360f3f48cf38c4a1ab82a09ad5b09d5833d0f9deaa6be2bb3b2f685776af278b4ca9238573fb8d952b9d9cc8f38f67e890964d SHA512 12ede7ca512b8694947fb518cd6d9071f7148355da0c70d7bc2fc1adbb322d0adf1810a3a46adc2a9e9c0b0b0961114e91409b2ccc2ea321fadb10cd388783b3
+EBUILD proot-5.1.0-r2.ebuild 1741 BLAKE2B 4537e25ab0d1584a3bf4275b0e206b185c185c39a8e6d1db90b0a1f9a5834a14b13cd80c402f2e1bc81c88acddcdffd43b776171bc205dcce2b532b8722de659 SHA512 72e36cdde36d715e7206c2706d41d5b4c74b8097da7fddd73bc2d046a955f6c116f4f405a8699e3c8bbd40c993dce739839f986ea0d1d6fab4485b6cc29e1b8d
 MISC metadata.xml 1021 BLAKE2B ee51ffc5905ac216dc1be7388ce514b84a25ab74f4593db590391927353dd4270f70bdff4cbadf645c66fc2c7519d36e4c84863b3d094a187d949f5c54f15ec9 SHA512 e8e8c014074365a50de8693c904eaa22340f426e985d661fd90ca5ca5f09514d366b5d32404a16edaddd817ef029c871f316409d5a10fff23c6c8b934584dca3
diff --git a/sys-apps/proot/proot-5.1.0-r2.ebuild b/sys-apps/proot/proot-5.1.0-r2.ebuild
index ac2eea07dbf7..32cc49074395 100644
--- a/sys-apps/proot/proot-5.1.0-r2.ebuild
+++ b/sys-apps/proot/proot-5.1.0-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=7
@@ -6,20 +6,15 @@ MY_PN="PRoot"
 
 inherit eutils toolchain-funcs
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/proot-me/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
 HOMEPAGE="https://proot-me.github.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="care static test"
+IUSE="care test"
 
 RDEPEND="care? ( app-arch/libarchive:0= )
 	 sys-libs/talloc"
@@ -38,11 +33,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.1.0-loader.patch"
 )
 
-src_prepare() {
-	default
-	use static && append-ldflags -static
-}
-
 src_compile() {
 	# build the proot and care targets
 	emake -C src V=1 \
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index b1f138294dec..d9d05c1a9498 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,5 @@
 DIST qdirstat-1.6.1.tar.gz 7708491 BLAKE2B e6a92f93c76de0f602a66409a2701cd06f1744ab67c3c829938695f1d59b7244998d3a6ddd9d6cfc6408db3ac98d355f4496348ebd198c93ea345b33414c3048 SHA512 fd4c6a3582184785d935e96e884cc3e2033e3ee174ea893816b14524c5c5c62923c5a8c5869969fb8b1d0e84bbffd9dc707a68bdb53898c55dfd14fe16946110
 DIST qdirstat-1.6.tar.gz 6398935 BLAKE2B dba15df3f9dd34276ee38ccdd97d1b8158596198b22a807b4d0a68c7d33d146a25ef5b987c4a6e3dc16df421422ddc0cad2e9f60a80493ac668bcb023c15c31c SHA512 8d1350bc8995dac2de90a32ca5ddaac47a317c7e7044f39ed87a7b2e208cda0b84f04c147f7a2414d7a0c5c731479847a879aedcf5781ca772fbfa8fa360cc77
-EBUILD qdirstat-1.6.1.ebuild 890 BLAKE2B d5cfa2cb6e00b037ab1c4a4636a3762430d267679a84c136b27a0b96f8991fdd2bef3ab5f4da1877787abdc7b0f072307babf613bd990a233f79c9813951f294 SHA512 5d861861b1e133c032dacb7cae0e8a705136c118f4c25a5f2c037969de2f94f02344c301068b1c596db6c3b38fbab1c299dd9a8196883347fc9cb422ef9a0941
+EBUILD qdirstat-1.6.1.ebuild 889 BLAKE2B 8faa6969eec2981808d95d70970bf564c9f1410b8bb52a42492da38a2ddb778ee706881eb0bac136121fa810c62b6897bf568e412971fd841ab57c573848d370 SHA512 6309e5202ec80bf204bb562abc061b07c081f3e3460b56fdd6f5ee489031ec91ff3eebca3eaa5a0fc78109f9dc9503d708ddf70675d5e19d8273b9f2241911de
 EBUILD qdirstat-1.6.ebuild 921 BLAKE2B 49357e923dd3fb8d9b022ea42c3aa6cb55e583caa6bd8800e1f45985e197aa144a436004974070b03757dff548dfdf6803261ecc33bea706cb4b3650ae3107d8 SHA512 a83e63e5b5102ccc790bf7098c43366aa3e6daf0d80fc435969c0157f56ad8e916885a581053d1c64d920673e1e0f06ba728be18de8744285a6efc424eb0a2ce
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
index e4bae2ee165e..5adc75a04f39 100644
--- a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index fd05aa8c4d8e..75538fe0586f 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -9,6 +9,7 @@ DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST bstr-0.2.6.crate 336014 BLAKE2B cfb2eb6ecff2e0e18f26b05fc284cfb9db31f022984243b9d8fbb25d03371588a829a73cd312f0e54daae1f49216fcbd0193385ba7183a73b992a94b619a07b8 SHA512 e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4
 DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
 DIST bytecount-0.6.0.crate 11905 BLAKE2B 7d935f86f0ab82c6c3d4974cd25ec3e193cdbea68b9534b1a461007d1486adc27274b43febd645db045cdd9b8101f93fb4b985ceb076c99a8f6efdc5e69ae855 SHA512 8e675f20b204d5828e79ba50012744b2f1b83f9d5d6355e6acb7d24cc4f7b1080ac120b94e65b6ea1d7604464ea0c6ad4f29880ff14895610889e4396f87062b
@@ -17,37 +18,36 @@ DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883b
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cc-1.0.38.crate 45503 BLAKE2B 19d8be59f639c200e43021eda8174dd2b6714d6a8756e1a87d01dc5d3876d11ceccdb5874cc0d2f94da3bba1b576f31409f660dd120a1ecdfe63adc6bff72dac SHA512 0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30
 DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
-DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90
+DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
 DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 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 encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
 DIST encoding_rs-0.8.22.crate 1403758 BLAKE2B b18eb34df4ddaf43c30ddfb5f531aaf30047bc1753d93512013854e8702f7834c463d4098b90c11be5df3f5c8f67bb785ea02d7e2f21d0e925361cb15bd68e14 SHA512 355b98e964ad126d94ecff2777c2f8592c74212a566b7162fb484e594d13cf9c60acabde291f244f8df5d5430d21813f951ae7fd503ed2fd35bfbce58aea88fb
+DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
 DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
 DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST getrandom-0.1.7.crate 21488 BLAKE2B 70bc3a4a4b4c624f5df8dd73954de3b77feb897406b7907f88357f6b4aec919fa72560e219933e744f909f3408478dd93f59cb28d53f7d608b7b6edc3204ad90 SHA512 e38e82ef3d3613e69e2ac38c63a16e6a4f0a7d54f8b894c45e1c9cb2b1d4f8d9a7bbf087c3561d5482fe45ecd51f3d4b2fdc61638df2c380e3c9c3d8fcc03eb3
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST grep-0.2.5.crate 7137 BLAKE2B acd9dbe588693a96da75dbd66fee019a5fb959a5bd16b8e5c25b75111b9168317fbfbd9ba6a157f4e12dda73c27b99260cbd4feaf7032b06ad974753c62fa586 SHA512 11bc94251db60666c5ab585b03df16ef15d064d85da57e03204311a8b346d91c172ac34b2f4b100bee6546f7672cacc5ceb3e8053099d3b287646b523882e584
-DIST grep-0.2.6.crate 7140 BLAKE2B c5971c3c4c64a4e8b4eb2b261e92ee49be256cf200ee154596049e48e9cb34e1ba6c787ba9ea53964b13256b99ce852f530768a967b246a3a8991e4ca5a07f04 SHA512 da464e408acf96b58e23fbc6297ae56894b2c1eb1d8fa700b1f3dafb55e983a23a28fc43db9b432d14fe5125a5120718201c1538200b3c2db3e4d5aa9c274402
 DIST grep-cli-0.1.4.crate 16923 BLAKE2B aec2c54ce1a6677d9afb22c2df85578bec6cb486b2e6173b539a4ba99eb423b42d79c7b8c2ef631c1e08bc4e5338afac88dcba7d1255aa7deee94f4cb03c4f3f SHA512 77d0898c51824604025663cfb2b7ac9731e48c73c791a70ac13c8365cc42be8a30316ec2bfb2121fb3907e1227c1497d852142022f7145fbc840a255826bb377
 DIST grep-matcher-0.1.4.crate 15569 BLAKE2B 31681aa4536e5d12d17b3eabd3da054f1597df659878c79d21f587b17590eb7049b2f20d74acdedc86257c68125cd32c670dff20fd72b466f5b51926b671aab7 SHA512 6bb8fa1914cd34e61340d86a0ca09556f117ff638264875800fe2516662b4e8560e8d68e79333a0c19b6bc48e8d453dfc36b901747348c633233ce4b026339e4
 DIST grep-pcre2-0.1.4.crate 7811 BLAKE2B 69c875087623e7631cfba1e28b19d7d382dd8903da07495b588570cc4aeff83248d107d0c5174907b28fc1ab730409406c06723283d7203a643f7f764e3a1258 SHA512 607453d7f5c80a4cc431c9ec8a14c647ddf96cd785158c2a554482b6f37964a8508a0e64300eab1bb2f789360bd92687b83fd6c757bd0cad7542bc0b49cfb678
 DIST grep-printer-0.1.4.crate 43337 BLAKE2B 94f17cf7b3e04b7cad4bee7a98fe5aabbbfcfcebf8e585f7e2f5e6cea0b5cfb93aac95418eb30f6c92074333d47ece9ff751fb33f509dde863d027f1b4ff7819 SHA512 611d825c0648620a13178beb6e3fe24fd1b592b233901cee009dc7b882237923a188501bf4ac9eb1fa276c665300389443e3f30574cb9bc81745cda7cd7005be
-DIST grep-printer-0.1.5.crate 43595 BLAKE2B e5a27cae827630c8d883c8e67ffcc1a302d45d09002ab578a051a3fcd88456341d12ef714c2bdba5ad6da7b737d0be1935a50a3e712750db8515f34538949d8a SHA512 21e9257b6bceeff3697d603320ebdfb0c1f2b8b9659a6f83ae63a9b5426628025a5a7858ed8d9feebd5576411970ea137c1fef9937a971012e21a7d5b8ccdad2
 DIST grep-regex-0.1.7.crate 29021 BLAKE2B 8359f4f42a1cc310ba1bd27fda671549d70a955ea4050039c791025460c2a303844f59b0243b689a8d85854a949a76604be4118c2312943c9aa59af7ad7948bf SHA512 6f0e0708aecfbad9da598cbd1deb1ffa455caaad13e540b14f127eb0bf8dbc5f085124f45701e8db753242d34e3b0d1a507e2abe7ae7981e1994c6f93c054774
-DIST grep-regex-0.1.8.crate 29085 BLAKE2B d96475cb8c03cf5b47031519895b0dc3e1994082da355579942e5fd9ec81d09bf0c0f104d6d7124d1f72b1503d2e2104b59ba0cfcf282dc658f83c2c00000a44 SHA512 4ea9c4c7c0e6d24298b893593d03fafd5a9f7567319fa4c0f386a1e33c6e15ecb6c5da85e272b2f2d295dba00d84829f9cea699503676146bb6e233f28a2829c
 DIST grep-searcher-0.1.7.crate 44320 BLAKE2B 1876e0523c99c6ed7c85f3291af76063677af09e62d94fb414b18142732981631afe31052480183ad52bf7cc44cb14afc144099045f3efd3f13b4883b1977f55 SHA512 2c32ac1fca430b0ec740c6f60d92954af81f30349865a04affa83959ba2ed04285aac31c4ec1913a03913037469b49bfe2607c887315ac32390d2f293876cc33
-DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
+DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
 DIST hermit-abi-0.1.9.crate 9032 BLAKE2B e9e314be938aa0cd1405b480ace091d8b0b33be559df3ba1323972f1de1b1b2b7a4b77140ad7273efd54a1066c162e5ea0f25b281dedd8e100cd83e1f6315b51 SHA512 6dee8ac600da02564f95762837c85f3f458b6167a930f9a214642aff3d8c6cedd8c862a0512a8bbcd170a325b55925c43c34e81cb59a21c58f9d3ca9a73c93c8
 DIST ignore-0.4.14.crate 51922 BLAKE2B d93eeaf945fa5165461979e2f54969b9e2ccf2f4986bbe465fba8a1f0f750ce66e82c1cc48d526e2115c8ed302daf37aa368503bd56d627ebdc9609a3136576d SHA512 eea97e9a80c9ae67b2f8e970e6d4362e8b2ed2067b6c94f8de51f851133db5e782fa0cedca835d342bc66af4ede3716a4ad97c9e0129bd5b78f8f6aacbfe23c6
-DIST ignore-0.4.15.crate 52328 BLAKE2B 12567e87ae3c5cbf6daae21b4b1a7df7270f95734a8e2d21d7eb038e7a195b8fdb78da646c00fb232f2357ed1eccdd10c747d8985e0edfa6ae847be361203977 SHA512 f12b152a841d29a812af12d668648a142b79b4cdb01eb8c59ef9574c7c7bbcd7321b3e049bb3931866c3b26c196dfd3a48f7e5df63fa5923cb13a2daf0033f46
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
@@ -56,7 +56,7 @@ DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
 DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
-DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
+DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
@@ -73,11 +73,11 @@ DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST proc-macro2-1.0.12.crate 35819 BLAKE2B b4207a6e1baa1a5bccbe61e898eb97f7ff874fa4db13cd4657def82d6120f65c151ffc4accc7036204dd32bbf4d065ebfc8b37675d99647b7b6782612656338d SHA512 4918cf60005aa322ad7afcdf2f6352f95414f5652a85742334bfd8f246a9f5438b5e4a1ae8d7f04fd07d2a1ac3eb18e118fc49367a91183778c74814704d5715
+DIST proc-macro2-1.0.17.crate 35654 BLAKE2B 8728993d92facb86d5884a5716f697447d636ba28a3ac84e1ac7971fbe53b7fd960a5516989882eecccde20abfc9f1915c523277333ae98323b7dbc198c0fee6 SHA512 de34066c8f07ad5edaf2a7fb9b0e0e2b4d31e110a2280dce9960b20871cd69c4510ad7669634e734b3d4f06447277b62de028aad826f5a94697261a8bec2a0a9
 DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
-DIST quote-1.0.4.crate 22965 BLAKE2B 6cb3471e1024134e70044195f1c776be1835e0a5bb17a8428d5c4aab41013ee173fb8f4b3ad22de020a30e61185e966116079b9f14db177281b0515299a09c08 SHA512 cf729bdf4eabc81d92529394c6bb9e7a3d05a449d3a306c1e536e0ec9bee789d0bf0c0d3158c58b7a995a7f3c1044cd746bac84efc087cf8fd740a98a25a97be
+DIST quote-1.0.6.crate 24225 BLAKE2B e8706bf2e19b89855d5636704253d674fc9804e0d9713d1c1dccd5fe06af273f8604f80b6727f788de6416e62dde67a13abc2f3aa81cd5ea45eb0c73069ee300 SHA512 1febd6748602d4d96fbacb1f37bbc93c71d9fbeb9be7e9c6be2e871614048a1b2921c1ae702bd8db5d449308e7946ebff095689ef0bafe52af37c04936a8115e
 DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.5.0.crate 19736 BLAKE2B cd0b6212ef01e703510ff0131c9745bf5da4f55d96e321f943527a39e57c8403d1b37bc790f6a09addaa85947f0c431a3001ff14beebe67193c5628d4270f393 SHA512 e98f9b93cf5a80c40c11e7e8faee351ef567ae7cf9db1b7789a61eea41d6509e83684da00284e6e3d0f52af08ce2a834339e652f1fd39d818a2827f6236f5d6a
@@ -85,35 +85,35 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST regex-1.2.0.crate 245604 BLAKE2B 68951a1e686a4e7c1ba059e8d4c68bc44f59cf824d416d9430ca226c9bd52de42568a4ba041733a6f508711a94bf6f17fcf052683c2744885c98ca1c672ec0da SHA512 ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d
 DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
-DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
+DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.10.crate 276985 BLAKE2B 6cf614eff1c3db35fb60f206c927cbd8caf4ec4942089c9356414b0239f3fa060859cfcf48e18184ad8f3a0aeac71193ba0878f3179653fa626dcb3d40de5206 SHA512 30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST ripgrep-11.0.2.tar.gz 461565 BLAKE2B 5a9bcb423c470e99cd9e9299fcb9f2cb2f663ad1e3b406f1abc6671e68d876e8cda1866983d96fc498498e796c1f3af16838799741ce87b0d5b400e440ca741c SHA512 62b5bcceac2ca4899e797799e67a8e45730f1bcb5115b48e9ebfe12d3b0e43921020f368e4328b0f5060ccdf0dedb8935857ece7126e05d9cbcca535cee68a92
 DIST ripgrep-12.0.1.tar.gz 475088 BLAKE2B de1298e5961babcd0e902acecc7a1a16d816bdbd7ab0e28db1b98c2614cd9433bd6f7a3eaadacb3779864db43a1960d35d1b5a2dafd6798715522424fff011b3 SHA512 2f05a60585e522ac900103c31990032429c6652647efc022ee0ff401019a4dc75614b6e0ac0779736398fe067bc326b3ec97e166fb5a58d09765f9b145414b4b
-DIST ripgrep-12.1.0-x86_64-unknown-linux-musl.tar.gz 2220989 BLAKE2B 91485cf7e7922aee5ee4d65feef3480c68f825bd57418c360667a458fa91ac7203d91cd33d46f034453501c75bdbd44e2a4641e2f0669e7c77da3de9b8c9a1e1 SHA512 9a47d6afc5d4b8028ae3488f491bfc46762cd442e15941535152547e51a368fa8992f81397781dd0479af921e64e0a3828e3a89aa02833c8f1dd1437d63cd21e
-DIST ripgrep-12.1.0.crate 256006 BLAKE2B e3d1c68d592115bb2bfcae66aee21a40e61280d97ef35c46fad2ea91428927428179df7106b94f9152674816f6d209b2806b743b80d594ce1a3ebe34d9fc2ca6 SHA512 a27907361bed2828a7c2ef058aa7164293973f2a2a87725fd939dacd60c69cad53f1e61127f46d7955f51ed598813f12a98facc37d29a7c20bf96e4855595e91
-DIST ripgrep-12.1.0.tar.gz 480128 BLAKE2B 822cb4485307ccb44c148e5356c1141655f53c3b6b0a964df339243f8d0d02740fff3ae42e7389267b46c07b7cfefdcc94bd4fa8182aa9c5e274ca6094f2f570 SHA512 083603f4d65ab83d541eeac3573b400b4009bb1ec04e2bbfe4c6b6172c251cd43418f9ab73d0f0fdaf32c813ba7ba9f89cfd5f51e1b2907c2f63fbf9531b031b
+DIST ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz 2211756 BLAKE2B 1c97a37e109f818bce8e974eb3a29eb8d1ca488e048caff658696211e8cad23728a767a2d6b97fed365d24f9545f1bc49a3e2687ab437eb4189993ad5fe30663 SHA512 814a6aa826f1183f40c5b74e66665b26e1377fe95d8b2cafceffa0b7ebf26ec89a515c74f5dbc2b9af441b2daacd239c7393047d8a75e944e42792ba451a77f9
+DIST ripgrep-12.1.1.tar.gz 480607 BLAKE2B f324a7966641843a95e7d4930507167844db2629e4b12e738df56d43edc68a707fdcc38eaa6f2445e3ddbafd13ec8888543866534b7a04724451e1457f589bba SHA512 9e2a16043be6c7727d49a44f6db7fdb41413efc869139186729985ff86dee5c6531c663352f4019b730eb3a6c46f26d46df3738d4a0cbbc39ab773f320eb9e59
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
-DIST serde-1.0.107.crate 73345 BLAKE2B b2cb9cdba93d13533f36027868dc5d33eb11a8c0c9da5e227e1c5847efdd95adf69cf3a331ef155931ffbccf68f4fb3f69ba84cfbd5c55b103aeb9a65b10c984 SHA512 07d26a1d8955f18d3c8e7360bbcf38f03ceab8a923f68f3b4a6bbd0cd7aa2a5c002cd0efced322bb1e79ac4aecc034765bd27bd7a526c2f135c843a9ab5ba905
+DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
 DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
-DIST serde_derive-1.0.107.crate 49593 BLAKE2B 9603bdac47d8eccac9c59ff7860da5e4f4d8606b3c00d5f52f48d88ee9d20af47b2918631ecf7c36a94fe3f4dab8f69c61524e411555bb91e7d57580a693165f SHA512 07ca022f374f0e8d46c463e141a9b9e9bd32d6bd2cccfa73e21f0fb4d7bab9c92d910060af4e5b693169c0d49f7573232aa13ecb6617d3f188778e2b547cc2d3
+DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.50.crate 72229 BLAKE2B dcf9ea24386a103f5b5ccc3e9eb3f0c3a083cb46f795b2ffc2da1fcc1d965c56885a417a64c3ad15c58aa79225f4f89895b90b56048cb9e1ee22bac15c296e84 SHA512 e1ca850d059a357ea9de29fed42b3945701b2b130a6b40e708b926088501652c8426e272ff754534f972f68dbb8845583df7e0887de139304245aefecce7388d
-DIST serde_json-1.0.52.crate 73135 BLAKE2B 58d6150e0a198089e532445f5e78e16c322acd344b1e883f119ac1256490eb90da570f82b334b2e3daedcb6ef9a35fd3d057a307fdb0dde9a8400ec9db3a0bae SHA512 70bf27a8328cd57f0e995a57db97135610cd025c654555e51314309ad2f1b8968c559fa1bb5ca590df138429d0362c6a70a61e17e3aac3c4d7fd02ae4aca4558
+DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-0.15.42.crate 185561 BLAKE2B 1c9bdd974393f020b6c56d78608349e52be836ca3a0f34f68a9c24107eafae02a32e998ceb5aa710be5f2b7101df71efba0bc9baaac36bc5c3ff156db5f879d4 SHA512 b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989
 DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
-DIST syn-1.0.19.crate 198451 BLAKE2B 7b039572b2ea68c7b05fa531b618c53cec2b568b158091e7249aa4fc3438895b514568a299386c516287096ca2f8a69c4a81159bc4e1ac51e72cca9289662687 SHA512 aaf23dc81c9f2a6270abb704d51cd6f78b014917a81d716244ebb37101470465611986137e57bbbff2e16a30b85b50b75753663a28b11a93e262f7e0b36bd8ab
+DIST syn-1.0.27.crate 202231 BLAKE2B 8fe663765f40cfb611e6eae5d51744adfb22adeb43da799c000b9ba856117631428341ad352608334bd57ac18aad6076e4574591ce7aa7908af90637ee363dc9 SHA512 3a3f2f6e55edf003ce13dfa35c5d1a03d875335ddb3d0093fd20c86231a246a61655e6f74f751a9265a6be18af20e794522b7b83d303ee363b891ac9a89c72ae
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
@@ -138,5 +138,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD ripgrep-11.0.2.ebuild 2568 BLAKE2B 869b9ce5a3a053b87e2ac721e98364fa0244cd8f42f255ccefa91a3628d75d70064caecbe90401e4e6108f3acded31643f374d4c10f71e46e09e2d0dd3baa1c9 SHA512 2120f89f201965787bae5f545aec9fce473196fe5b81a382cb65772eee36f4e6facc73a4738fa3f9d6c2a4b2a8ecd9b9a02a8f8baa8f5a6966570e62222ace93
 EBUILD ripgrep-12.0.1.ebuild 2555 BLAKE2B 1d85acb5c43ebf76a790fec45e522ca3c43900ac9ce99ba17f7d577fedbd27fb995652f65d9e35262dd0377e6dba3fddfbbb7472c91daf87e3e71bbab2d90e61 SHA512 5b155013323f28a06a34948d1f2e687f09dc0ab455e2fa87c509b56e2a4e76a06cb26935272a00ab487aeac9bfc3377205484b04fd103f01cebbfa1279e73429
-EBUILD ripgrep-12.1.0.ebuild 2712 BLAKE2B 57e5906774b483c098729fd43a86fdfd03306f24984b63af611b5a2fce5e4f4933bf12fabe9d251fc231b711c8401333de8dcdc17bec6d8176b2468af226d173 SHA512 5963fe6691c02d95768733d851263034a02c70f601e173d50cb3d3817691b251345533e34ba1e410b0096d8ffc767e3a2bf0ab34ff55e0e5cdd94cd56684624b
+EBUILD ripgrep-12.1.1.ebuild 2551 BLAKE2B bce93bc68d2fe5a757b4b837e292c7d039da3e218583b2b77808a578a5e02edd94ded5782692747ab8d421f20e55bc627057d8976b5f2942eb0c29fc788b9ae5 SHA512 62ab0d1c2362dbcd8e5e5d4e85b8a3226c71748d852989fe68421c25850be522f2f3568fd4f7a87d1ed69b18e85fe6f27c47247fc784fecf8dd983f81c916256
 MISC metadata.xml 730 BLAKE2B 0355062074dfce2208602756187dad5d57f281271fb156c7cabceba38b3097b21b9ca46c713c7aac661249676de4e79fef92c9111c58e4dec70f0f9ae8618ee0 SHA512 683936fa04bc52eed49d0c8c64b15d22cc2583abff4d4549abd6b9156e33a0a80a5088802e5b321c40debd30ea70e1f93877f8caaedb164ae6c8a703fe961460
diff --git a/sys-apps/ripgrep/ripgrep-12.1.0.ebuild b/sys-apps/ripgrep/ripgrep-12.1.1.ebuild
index 2e66074c66e1..182d9e9b1090 100644
--- a/sys-apps/ripgrep/ripgrep-12.1.0.ebuild
+++ b/sys-apps/ripgrep/ripgrep-12.1.1.ebuild
@@ -9,34 +9,25 @@ atty-0.2.14
 autocfg-1.0.0
 base64-0.12.1
 bitflags-1.2.1
-bstr-0.2.12
+bstr-0.2.13
 bytecount-0.6.0
 byteorder-1.3.4
-cc-1.0.52
+cc-1.0.54
 cfg-if-0.1.10
-clap-2.33.0
+clap-2.33.1
 crossbeam-channel-0.4.2
 crossbeam-utils-0.7.2
-encoding_rs-0.8.22
+encoding_rs-0.8.23
 encoding_rs_io-0.1.7
-fnv-1.0.6
+fnv-1.0.7
 fs_extra-1.1.0
 glob-0.3.0
-globset-0.4.5
-grep-0.2.6
-grep-cli-0.1.4
-grep-matcher-0.1.4
-grep-pcre2-0.1.4
-grep-printer-0.1.5
-grep-regex-0.1.8
-grep-searcher-0.1.7
-hermit-abi-0.1.12
-ignore-0.4.15
+hermit-abi-0.1.13
 itoa-0.4.5
-jemalloc-sys-0.3.2
 jemallocator-0.3.2
+jemalloc-sys-0.3.2
 lazy_static-1.4.0
-libc-0.2.69
+libc-0.2.71
 log-0.4.8
 maybe-uninit-2.0.0
 memchr-2.3.3
@@ -46,19 +37,18 @@ packed_simd-0.3.3
 pcre2-0.2.3
 pcre2-sys-0.2.2
 pkg-config-0.3.17
-proc-macro2-1.0.12
-quote-1.0.4
-regex-1.3.7
+proc-macro2-1.0.17
+quote-1.0.6
+regex-1.3.9
 regex-automata-0.1.9
-regex-syntax-0.6.17
-ripgrep-12.1.0
+regex-syntax-0.6.18
 ryu-1.0.4
 same-file-1.0.6
-serde-1.0.107
-serde_derive-1.0.107
-serde_json-1.0.52
+serde-1.0.110
+serde_derive-1.0.110
+serde_json-1.0.53
 strsim-0.8.0
-syn-1.0.19
+syn-1.0.27
 termcolor-1.1.0
 textwrap-0.11.0
 thread_local-1.0.1
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 20d20f818745..64064308d206 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d620
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
 EBUILD s6-linux-init-1.0.3.1.ebuild 1670 BLAKE2B 44ebba5c2c178321335dd0d9ace64c3b9c0afb759058f5e4dd753e6f70e4a3e973aa6598d4165588b7a188b7c7316cea76993a44f2f6daa38efab3d928a2815f SHA512 448bc4a1680f3c01dec7c8841d38e5f70c7deeb3f8640e11100b66604fc9b1e38541cd9355f1e270498d68e66052341db038e2bb80d66169a46aa08c278cff43
-MISC metadata.xml 613 BLAKE2B bc2c03cc9d2d45497a6dc07dda8254da8eabcbeda57d4d498a6cd54ed9aef47e21c07e377caebf128c5d629dbdbff96fa3fad5945b04baab165955900c2548b3 SHA512 7423081e816cb5a093168cf4b21cff5a441319cdf0fe16e89049ed98371c43b9abaeeb83de88b7160705ededf64572b5b325e5bf7fe5155f0bd20b35a6f1b97d
+MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index e45befd4bc71..4f506a138719 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -9,10 +9,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
 	</use>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index a1d2f0419c1d..5cacbfea53c7 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a
 EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
 EBUILD s6-linux-utils-2.5.1.1.ebuild 1001 BLAKE2B 8edd153ce678780a00bd117f705a87fa4cedab230abeb264849c070371e58d7d3fa1994e80081c8d92910f9b01fa48f1ed29d8e4f4e51742aa488c6d11d4b74e SHA512 ac74fa279c62cc0befb15560d2bf104eea0a8881cc3aa60874b830466eafa295bd1b683cda01b338e2475201f158d8666217ffd67cc237c1889503ce498d2774
-MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
+MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index ed6e85cfdb12..2e37454094e4 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -9,8 +9,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 0ffbbacd95f1..e10c9c556cba 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca
 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
 EBUILD s6-portable-utils-2.2.2.1.ebuild 1012 BLAKE2B 56f98bdec67327b48cb116f3ff1277032a9104b619ea9987094dd252f07589932e30418f7beab8d73cfef5fe59da8331b94b6eea10c304dda53ac13874cf4651 SHA512 efea2a361175ca896ff3ba4653149d43c703c8aa9481c817ecb4497b558cc6df8800cac5bc19b6dbf4d0c94b4f3519898b864bcf53ef36b588cf6dccecaaaa58
-MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
+MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index ed6e85cfdb12..2e37454094e4 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -9,8 +9,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 81a70b6f3b46..e1d2ee6d349c 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -10,4 +10,4 @@ EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d7
 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
 EBUILD s6-rc-0.5.1.1.ebuild 1491 BLAKE2B 165a756e77a0df7585de298f715c6aa57112f025fce0daacdad0ce348bd297010d21e27488c81c0acb719d1723acb6417d7a15801f3d912947d6d6bf8288e183 SHA512 d6a433d0be0d444e01cdffb82b269369423e1046fa088608df19d1dae26078b2149dcaf7b504b860f535fe4f1f95f633dc693c79ad85190e0a3e7cb852c156ce
-MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
+MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index ed6e85cfdb12..2e37454094e4 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -9,8 +9,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 797e2c2f316a..b38c56fa03f5 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -12,4 +12,4 @@ EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08
 EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8
 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
 EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c
-MISC metadata.xml 640 BLAKE2B 892084cfb2c287c01d24489fd4639def30f4ad42b2c81d5b87479784fb2f68de633846eebe30cd747360195b5d90edfc9f5127a8ad1789a2a7cba9754279774d SHA512 9b6c0b9ad73dc818a0f25d0cffc3ed54c3ba8a0e1917370a2f2f4733a973a63cc0033673d8805ece30cab2e611775b10caad8a48b48239ee1bcca3dd3e05d15e
+MISC metadata.xml 523 BLAKE2B c4ea2993837db7521d17e1147bc02d366b75fe182bcf62502b90f91abb559ca53eaf8ed81b899b6bc3b6abc5211852919379e2adca996649d168d2ec6574343f SHA512 abc0bd7482be8f1ec719ac7c9dd0a8f754a8d6a4fede9107497cdcf6db3d4b1b57b5b6f38a32c41dbb7db98dd43a10846202ab084dad06dee0fa36d713dd2e17
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 311d57d392d8..1b7eef43c733 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -9,10 +9,6 @@
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index b717617446f7..34553e8686a6 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,5 +1,5 @@
 DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
 EBUILD sed-4.7.ebuild 1111 BLAKE2B 369db9f158dc01fe1e6405b174ceed1ca8adb068a42002bdc84bfe1db64cc00a7758747b0ede85a67cd44e169745e542667d7029f459deb2ef084c896da760d2 SHA512 45f5f6f4d095a007b4c5685f6af3659bd0194f1ecc595059c33866cc07f9dfbd5ed7fdb1b1928e01bba217b0898eb1f1935b0121e0f25467d386c406bcce4717
-EBUILD sed-4.8.ebuild 1129 BLAKE2B 1c73799cfc28b920f4421fcb3933744ec07a8663e1f65c6b279affa8e7832a9db0040d7b08f419d78f7f228f4ce2a542b0b4b41a6f69be48538baed21d6a5ea2 SHA512 4aa30771fd81ad28a55647e2103d0894be71b3e6953fc629fc7049c3f5aa2d25431fbab5da3455aaa822ea6201b9a83519846f49d36f6711cf5833251124dda6
+EBUILD sed-4.8.ebuild 1028 BLAKE2B 1dc3feafbfab4bd86dc4021433fab9962b455a1acd143db94011a5c1184d6e58bc2088f161fd5af0efb665942a0bdfc9398dbeef52eb3e7225daa27bcfc3ea3c SHA512 421f6196dcbe390321e1021f521dfa6819612d0981fe7a8d24ba435088919b9d3e870393c5844556053d25fa4ed2fe6b9ee91a488ee3c8dfa1e4635f898208e3
 MISC metadata.xml 373 BLAKE2B 3aab40c661d76a8005ae92bdfcf6a3b20732c052b95183a64008a88ed47fc9cc7f663cb1e778eb3b61c6561d854cf805ee17d91fe2657da7cb295fc5a2b2073c SHA512 383c7459fd3f9d0d3e14d819091d1100fd87723bc17ad7492ef6df06b9b878116a628a7cedf38f167a1ff969dbba02b834aec45e4f04e87cb5cff3484553052b
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index 66b31632c461..bada9c0a526c 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -38,12 +38,11 @@ src_configure() {
 		myconf+=( --program-prefix=g )
 	fi
 
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
 	use static && append-ldflags -static
 	myconf+=(
 		$(use_enable acl)
 		$(use_enable nls)
+		$(use_with selinux)
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c61598b63c4b..6f3b38f426d9 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,3 @@
-AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
 AUX 244-efi-gcc-10.patch 3032 BLAKE2B f9fd018c567384171b154809bb95b35c18fc9c3ad7d5c114f5854bb90db2bdafca9d96c3437a9d20a7ea875a3e5646750f29294025fcb657a40dcd7d4ed95282 SHA512 f9bbc9c3be417ff14775de06d3c4088913eff4c6f62e58278420345cbc7b115b706c169faaae9dc17448f895d9cf9b417ee8c04398ec4c206df89f5f3bcfb4a1
 AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e7569cc06709faf6fe0894d9c9856ba54783e141341c512a401428390f7233050921e5e045b867f7e517f298 SHA512 6261c71cb4afbbbe5189f7ac01bf7cc50139edca4175f6f821941e012f5f4335835eef518e187996612e174159947a4fc2fec70fdbb16c8cdfa82369c7f4c814
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
@@ -7,13 +6,13 @@ AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747
 AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
-DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-EBUILD systemd-243-r2.ebuild 14590 BLAKE2B 536b1996e88366d7aa24a474305f05ca2cd6d5e4f026c1fd8392679fd21bf1bba28ca8bf39121427faa1fd412fa3950d45e863e75a9cf2e4f16b3c499da68555 SHA512 49b6883b2a72a986a32bf084fb962698399449859b3dba42db6a08090a018a7598f4af0eb05dd86615005e72e3b4a72d0c4da7891407b1e0537cf7953c5510ab
+DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 EBUILD systemd-244.3.ebuild 14582 BLAKE2B 47660116f69e9b59f0fc125d206f41cb7a94b0d70245c6ce92de957ab294fe6e969797ff05d16dec46fe6430173dae0a29ec68fe99ea960e18d731e231a5f038 SHA512 00034a5c3ee577d1719756aab0721c23ee1b944896d875fc1fb81c41481aa1683b6d155ed42ba3ba2979b2a2b44c2231dc531f888b8fe4b9fcaf80260a712c06
 EBUILD systemd-244.ebuild 14570 BLAKE2B 918be50336353a5d5512653c61ed6c1e1cbb4f8e49ec7fd8b1eeb5436951ad82b3d7aa7fa0e313681a952dcbd64c7fd899bb5ac3a7a319a4508d099a358a8ab6 SHA512 1b9d610e10c5c1a21d80395a3a68f82f4201f6b1c23d7e57f98e09cb509a133e60484c5e72ae0c78819a189b930b2f77cca84e869af9f03fbc5a3a4ac9448ab2
 EBUILD systemd-245-r5.ebuild 15251 BLAKE2B 8eba167408d962a162117c4d666e0eb22bcff38ecf444e012452de9b98ee6971e552c9c908ceb151c5e979f99e4c9d5332d7107f9f4fc5d1f64dea0e66e29f0a SHA512 b20b15040dcd671ee7adbc629e800438c55b8c3ed4ade6d96ee3b72e4a46a98b10e26943e818f73ab9155613008b5bf654e8fbcd0c7f32db085e81926c9e4651
-EBUILD systemd-9999.ebuild 15213 BLAKE2B 048641234fbf08029573549baca931671a16dd381f0ffe0892d9ef1e9a3db788bac1dd1553c144519df0d681b9187ca169aaf28eb12a96672273ccb5574e6405 SHA512 4bd17b988fc96bc271ffe69f38d30544d5c77ff8a98c744b4f5160781c42b8593c19958b32319f95919126dcda85aa44c696b9318c48d2348caa9f9d1225fe90
+EBUILD systemd-245.5.ebuild 15213 BLAKE2B f6f7258fbd35b0dcb667ba5247354dd1160e39c60e6fea5813a1645738fe26135309959917cd8f48a108d2c0c89b4125f8e0685251a465a70f69156aafe3cdde SHA512 1cbe12503f9ec85fce5780baccb008c0177429f2f3ecbad95bfd59a74ce74b73fe08e5debeb5d5d1299158cbfb93e3d0ecfee305e58d232c97c1ffd11ab4d78a
+EBUILD systemd-9999.ebuild 15107 BLAKE2B 926970debb92249a58c5b1ade3cfbbeeb0ed11b08fcbb7ba80c33db98b0ae5089c258120ed9a3f459b76b7836c24fec1c21c25b2ce652c626e94d9c1c8eb708d SHA512 a1ff90566bc4b5bcd60f03892f17d0851e6ccf62d3b4316c0213c9c483abff7189d7d837d969f063da47ce105cecd0bbfca503997a2b020924f3c8f3248d8d8e
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/243-seccomp.patch b/sys-apps/systemd/files/243-seccomp.patch
deleted file mode 100644
index 88b129f77223..000000000000
--- a/sys-apps/systemd/files/243-seccomp.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 14 Nov 2019 17:51:30 +0100
-Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's
- __NR_xyz namespace invasion
-
-A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the
-same conditioning for all cases of our __NR_xyz use.
-
-Fixes: #14031
----
- src/basic/missing_syscall.h | 10 +++++-----
- src/test/test-seccomp.c     | 19 ++++++++++---------
- 2 files changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
-index 6d9b12544d..1255d8b197 100644
---- a/src/basic/missing_syscall.h
-+++ b/src/basic/missing_syscall.h
-@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c
- 
- #if !HAVE_KCMP
- static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
--#  ifdef __NR_kcmp
-+#  if defined __NR_kcmp && __NR_kcmp > 0
-         return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
- #  else
-         errno = ENOSYS;
-@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i
- 
- #if !HAVE_KEYCTL
- static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) {
--#  ifdef __NR_keyctl
-+#  if defined __NR_keyctl && __NR_keyctl > 0
-         return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5);
- #  else
-         errno = ENOSYS;
-@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg
- }
- 
- static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) {
--#  ifdef __NR_add_key
-+#  if defined __NR_add_key && __NR_add_key > 0
-         return syscall(__NR_add_key, type, description, payload, plen, ringid);
- #  else
-         errno = ENOSYS;
-@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip
- }
- 
- static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) {
--#  ifdef __NR_request_key
-+#  if defined __NR_request_key && __NR_request_key > 0
-         return syscall(__NR_request_key, type, description, callout_info, destringid);
- #  else
-         errno = ENOSYS;
-@@ -496,7 +496,7 @@ enum {
- static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask,
-                            unsigned long maxnode) {
-         long i;
--#  ifdef __NR_set_mempolicy
-+#  if defined __NR_set_mempolicy && __NR_set_mempolicy > 0
-         i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode);
- #  else
-         errno = ENOSYS;
-diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
-index 018c20f8be..c6692043fe 100644
---- a/src/test/test-seccomp.c
-+++ b/src/test/test-seccomp.c
-@@ -28,7 +28,8 @@
- #include "tmpfile-util.h"
- #include "virt.h"
- 
--#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__)
-+/* __NR_socket may be invalid due to libseccomp */
-+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__)
- /* On these archs, socket() is implemented via the socketcall() syscall multiplexer,
-  * and we can't restrict it hence via seccomp. */
- #  define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1
-@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) {
-         assert_se(pid >= 0);
- 
-         if (pid == 0) {
--#if __NR__sysctl > 0
-+#if defined __NR__sysctl && __NR__sysctl > 0
-                 assert_se(syscall(__NR__sysctl, NULL) < 0);
-                 assert_se(errno == EFAULT);
- #endif
- 
-                 assert_se(seccomp_protect_sysctl() >= 0);
- 
--#if __NR__sysctl > 0
-+#if defined __NR__sysctl && __NR__sysctl > 0
-                 assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0);
-                 assert_se(errno == EPERM);
- #endif
-@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) {
-                 assert_se(poll(NULL, 0, 0) == 0);
- 
-                 assert_se(s = hashmap_new(NULL));
--#if SCMP_SYS(access) >= 0
-+#if defined __NR_access && __NR_access > 0
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0);
- #else
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0);
-@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) {
-                 s = hashmap_free(s);
- 
-                 assert_se(s = hashmap_new(NULL));
--#if SCMP_SYS(access) >= 0
-+#if defined __NR_access && __NR_access > 0
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0);
- #else
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0);
-@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) {
-                 s = hashmap_free(s);
- 
-                 assert_se(s = hashmap_new(NULL));
--#if SCMP_SYS(poll) >= 0
-+#if defined __NR_poll && __NR_poll > 0
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0);
- #else
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0);
-@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) {
-                 s = hashmap_free(s);
- 
-                 assert_se(s = hashmap_new(NULL));
--#if SCMP_SYS(poll) >= 0
-+#if defined __NR_poll && __NR_poll > 0
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0);
- #else
-                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0);
-@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) {
-          * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On
-          * other architectures, let's just fall back to the glibc call. */
- 
--#ifdef SYS_open
--        return (int) syscall(SYS_open, path, flags, mode);
-+#if defined __NR_open && __NR_open > 0
-+        return (int) syscall(__NR_open, path, flags, mode);
- #else
-         return open(path, flags, mode);
- #endif
--- 
-2.24.0
-
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-245.5.ebuild
index 62ea76aad71d..c1e4b5fa23fa 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-245.5.ebuild
@@ -7,14 +7,19 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -23,23 +28,29 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
 
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
+REQUIRED_USE="
+	homed? ( cryptsetup )
+	importd? ( curl gcrypt lzma )
+"
 RESTRICT="!test? ( test )"
 
 MINKV="3.11"
 
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
 	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
 	http? (
 		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
 		>=net-libs/gnutls-3.1.4:0=
@@ -54,8 +65,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
 	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
 	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
@@ -105,7 +119,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
 	>=sys-fs/udev-init-scripts-25
 	policykit? ( sys-auth/polkit )
 	!vanilla? ( sys-apps/gentoo-systemd-integration )"
@@ -142,7 +156,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
@@ -187,8 +201,6 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
-		"${FILESDIR}/243-seccomp.patch"
-		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
@@ -196,6 +208,7 @@ src_prepare() {
 			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
 			"${FILESDIR}/gentoo-systemd-user-pam.patch"
 			"${FILESDIR}/gentoo-generator-path-r1.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
 		)
 	fi
 
@@ -243,12 +256,9 @@ multilib_src_configure() {
 		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
 		# Avoid infinite exec recursion, bug 642724
 		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
-		-Defi=$(meson_multilib)
 		-Dima=true
 		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Optional components/dependencies
@@ -262,6 +272,8 @@ multilib_src_configure() {
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
+		-Dhwdb=$(meson_multilib_native_use hwdb)
 		-Dmicrohttpd=$(meson_multilib_native_use http)
 		-Didn=$(meson_multilib_native_use idn)
 		-Dimportd=$(meson_multilib_native_use importd)
@@ -272,9 +284,12 @@ multilib_src_configure() {
 		-Dxz=$(meson_use lzma)
 		-Dlibiptc=$(meson_multilib_native_use nat)
 		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
 		-Dpcre2=$(meson_multilib_native_use pcre)
 		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
 		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
 		-Ddbus=$(meson_multilib_native_use test)
@@ -292,7 +307,6 @@ multilib_src_configure() {
 		-Dfirstboot=$(meson_multilib)
 		-Dhibernate=$(meson_multilib)
 		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
 		-Dldconfig=$(meson_multilib)
 		-Dlocaled=$(meson_multilib)
 		-Dman=$(meson_multilib)
@@ -340,6 +354,9 @@ multilib_src_install_all() {
 		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
 	fi
 
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
 	if ! use sysv-utils; then
 		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
 		rm "${ED}"/usr/share/man/man1/init.1 || die
@@ -354,7 +371,12 @@ multilib_src_install_all() {
 	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
 	keepdir /etc/kernel/install.d
 	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
 	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
 	keepdir /usr/lib/{binfmt.d,modules-load.d}
 	keepdir /usr/lib/systemd/user-generators
@@ -364,7 +386,9 @@ multilib_src_install_all() {
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
 
-	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
 
 	if use split-usr; then
 		# Avoid breaking boot/reboot
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b755eb2883ee..a3fe6fe103ba 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -205,8 +205,6 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
 		)
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 6b9ef2639400..c0219f3d870b 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -7,8 +7,8 @@ DIST usb-modeswitch-data-20151101.tar.bz2 30350 BLAKE2B f9acb91e9f213a405c34349e
 DIST usb-modeswitch-data-20160112.tar.bz2 31166 BLAKE2B c9d036fc836502f3197b456afc9348836208af5ffdea6d8fa79c762a24afea807f41a78243d82a09e56bd0dedd30e633e49e7552ffe56cb685ffacbe2746f0a7 SHA512 2da14d9a6e355921605f5e2231420326bae68b67466907b852c91a4f544101e31bccd703a6ecbae74b69cb518ab86d6732ffcacf4cbeccff55eea5befaedcaa3
 DIST usb-modeswitch-data-20160803.tar.bz2 31943 BLAKE2B 9b43c1a3e72497af1c935a61e0bbb7ad83b4d93619bb3897a5cead81e10572f8a705e7eb052ebde1ac04b85f4a367f07174a94b0828c1143136492fa98fa98cf SHA512 53c9ce700af986463e211fb918a06732df610403c149565c69e2d29ee5b248def7d607b2d10ba46da2b2d0be93803c1279e739b33eb14049520df6d556335608
 DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e3820fa56f1244de74cbfc0adda5309e4dc3bd79c2b6dd2023a5180f8d39f8b496485e1991de2a7fabbb59f6995fc7e0c0bb0b782243 SHA512 818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc
-EBUILD usb_modeswitch-2.2.6.ebuild 1617 BLAKE2B 216b3c94b7f204ee41fc36f95e5a3b6329ef5e2b225f78ea0d037cdd9f5530d12cb3cae88330ea300c2d37170612482525189f26792b872872f7ba65d66637e8 SHA512 905090c51fe23cc47d3f36cbed21cd590eb1132857fbd49c3fa821f824e39e535917c96f48b4716a524cb9fa3d68b13a5221ce57109d59e7782cb17624112664
-EBUILD usb_modeswitch-2.3.0.ebuild 1620 BLAKE2B ea03a8ba28fd05a2c09c1584ac97ca306fb4a085d20d9c1299f1b4878095f0b7e14ab5bc5cb47c5aa938e2a7823f7421f95564f82c62cf02fa1040f028ea2399 SHA512 1bffa0315fe2dac3b7748b3f227a8942b9f0e26e91f581e9c6b24927f564bf85d73c08ce061224fc0aad9ac6429b1e4d160f60bdbe6ca0d3bc916827f29c761b
-EBUILD usb_modeswitch-2.4.0-r1.ebuild 1673 BLAKE2B 4e9bcf904dc03abdb4ea4a4115826b1efc6760e10cc162ffd4996ce550eff77d30c9675e9b8f4a6487ff96cc0e764f6e64bdb81b22472f7ec2472599571c939b SHA512 a3e049d75118661a57bf590234f399a43c2774c5908e2b7b804287f2173e65178b171197019e672d6101308d3e477a788ef8de650a95a194f0523573510ebb5b
-EBUILD usb_modeswitch-2.5.2.ebuild 1667 BLAKE2B 85e8027af34df36bb2f050abcc661acdddec7f9c8d5b513fd4ae4537e4c5a254cf31570345a2f426f1c0cc1ddaf914c3fe9851932a7b51e027be5b2c5e7a3eac SHA512 220921d67101afd233872eec5e6ce1c180dd0ee377da35a9b964f966d8d49cdbd3666ed9f916586db5b375f6f3bf9f0ecb081b9fbf110dc35f2a479e58b84807
+EBUILD usb_modeswitch-2.2.6.ebuild 1618 BLAKE2B 51965bfe0cd191ce5d2fa04c8a3220b75d223f14743dc6af03d7bdbc4485cc7276e84a244f0ecd778fc0406eb1a1a83a5d3f59512a78129ddd5af7b105df6f9a SHA512 a03aa55c61e9cc2471002230df0c3cca107a993767335d96b4227df1bc0cdfa9bd0bf4effc34b1d2ebe84a5fe3f28bc969189f02fed29536a140914746587295
+EBUILD usb_modeswitch-2.3.0.ebuild 1621 BLAKE2B bd313eea043de7431089b7b485f3f899b719dc77201d43e1e59ff99d2797a7fd150c52a2b92c66e8af29530f126b984b2f7d4d7d7decca0c8aa28439ecb60e44 SHA512 81e79f81d623b0073bd5417ddf4df894dce0c50cc75bd034989bdecaae3b23e2d10ab9fbc8b0558b61e19311ee5de13a2dd6b8a62f2b046b0fcf48795020bad0
+EBUILD usb_modeswitch-2.4.0-r1.ebuild 1674 BLAKE2B 23b53e63eff1c31100688dcf0feef7b0459cb52bc936f989f079b7cbcf779fe2ae77ae2e78f3b72972ffcc7a3c9d32beeb2e68a1f9afa1a6cd0cae6314da82b9 SHA512 fc07e12527a539b102b626525f7cba77ba3beca9b254e1c21d7e8f692a58d09b4e81bce35afa5940402f943f3b60295e43ca3267a903ea23b3d0876e98e1b137
+EBUILD usb_modeswitch-2.5.2.ebuild 1671 BLAKE2B 304ccc0dee0fccac9beaf220e7ef1e6c07c549f197180bae7c6d3ae3ea8d9e64300f4b39387b0d7739e572f5575f3f3826929277c7ee6799f2f3b23bd1cbe343 SHA512 06bc65bb27d68ddb41d994feceb97de8dcaad790fecccfd247993d2bc2d54aeb9a97ba150b7875fd1a78a4f998ec88a3dd61efdeade725c2839b6081d27ec33c
 MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
index 9a9951b501df..341b046c566a 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,9 +10,9 @@ MY_P=${MY_PN}-${PV/_p*}
 DATA_VER="20151101"
 
 DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
index 8b257c026853..b2c23bace38d 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,9 +10,9 @@ MY_P=${MY_PN}-${PV/_p*}
 DATA_VER="20160112"
 
 DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
index bee31d5c818f..5a862fc779fd 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-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=5
@@ -10,9 +10,9 @@ MY_P=${MY_PN}-${PV/_p*}
 DATA_VER="20160803"
 
 DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
index 7e1756d13366..d7a1279b2769 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,9 +10,9 @@ MY_P=${MY_PN}-${PV/_p*}
 DATA_VER="20170806"
 
 DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 808b69653931..9a678ed5002d 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -7,8 +7,10 @@ AUX util-linux-2.35.1-include_sys_types-header.patch 1774 BLAKE2B 813067f0588184
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
+DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
+EBUILD util-linux-2.35.2.ebuild 8901 BLAKE2B 754af3199c098612c27e96d7f07d24486c45b03c4378460e6e224d4e1ff5e0cb2944c41dced090d76a8834769379904d7757455bb93e8c5e322b173fa9ca7f82 SHA512 ed7171580c93ab14a4402d177194b726a04c3f5d81d074527755e891930f33e0f411fffe597b2d337097dacd991f0fc09f6b71564f97b9323d21d52546e20d16
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
new file mode 100644
index 000000000000..a81c1721fac4
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -0,0 +1,315 @@
+# 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 toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
+)
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /sys-apps
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)