gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-apps
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
287 files changed, 1890 insertions, 5613 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8da9332fc028..aa81387b5c6d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index cba5d4c38f88..288b2120e4c5 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,3 @@
-DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-EBUILD acl-2.2.52-r1.ebuild 1383 BLAKE2B bd6b33ba28ef7874e7b072e119f7711b779776d5891f871fd52af0f6539f5d950c98367f721b861c4b03b9713c14de9794eb981c42187e5275d2fce6404d6446 SHA512 4d975c99a096befae707e5da57777ef0e5aa0c41962c8c6231936a75b90f7ec14ccfca3d79a80ea1c5eb640df2132db219b983863b3ec53bb75e0e6f51f1c39d
-EBUILD acl-2.2.53.ebuild 1231 BLAKE2B 480c89f323d9550d37dbea50847e0f61dbb8a595dc56bc7df9704f8103709cac620329ccba088ccaeba5eca58388fe8876c7cb9c564b599dfe1649f7d5b6b969 SHA512 d4243f0b74068edacf5dc8f65c2d4e3de856ac0534d3caab35754b4fdce390bdfe9766e51a5c10de8c922c01765f37948d106c6fd57c2985e7906cdd74ec0b06
+EBUILD acl-2.2.53.ebuild 1230 BLAKE2B 8b90ea7d615544bed6d90de1ceb922da1f458a5cf963f8931618bbb626bef7c6093b9dc144ea7af9ea0b73a1b01a3baf9920b179249542a90b6ef710a987ca67 SHA512 e649859f150337f3631e0af4377218352e796a5b561b468971a7ab7fbf309d9e9186b6bd44253adfa6d6c53ef33ffc8e13d8362ed5e3d867a92ace9803cdf2c8
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
deleted file mode 100644
index 11c8d630a18c..000000000000
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas po
-	elibtoolize #580792
-
-	# same as https://savannah.nongnu.org/bugs/index.php?39736
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-multilib_src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 6b676984e267..0ba2b30408d6 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index be08e8c077a6..42dc8443e11b 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,3 @@
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
-EBUILD apparmor-utils-2.13.3.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3
+EBUILD apparmor-utils-2.13.3.ebuild 2177 BLAKE2B f10d2efe345af36b4a3d3381656e2c33b13cbeeefc87e8bfc5ca2767f3b1aa3a1e29e918619bba8f9eb3da7bdd31c485384fd1481067717caf643707f403b76b SHA512 659a333209bb02524d15e4abee505ada256e5a3f6b5c5786518ea842438448a0b5d3aca3dbca8e2d41884d9f2d9fd4ccee9b90465612f051c19608abeb055ee4
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
index 4ce56c968e57..4a6c7fe814c4 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index ad75cd2d6eb8..e6cc05b5e8b2 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,9 +1,7 @@
 AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
-DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.47-r2.ebuild 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b
 EBUILD attr-2.4.48-r3.ebuild 2345 BLAKE2B 592df35ac9c11125147fb976df4abec28f7bbd9958b9498b200b65a11c6c0cffb92c0a794b504f5fc8f417e64d694349db4a00154cc91a6c3da2f6405cfedfd7 SHA512 963c3acd407a09fd34facd48ba6a26294c1bd913a4e0ddf79fc23b7690b236f2f8c14a9a631e52179e9a3d8bd2349f716a26a6ef84ac5ea129019f190eb5a928
 EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild
deleted file mode 100644
index 62babe4016f4..000000000000
--- a/sys-apps/attr/attr-2.4.47-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )
-	sys-devel/autoconf"
-RDEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas -u po
-	elibtoolize #580792
-
-	multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-multilib_src_compile() {
-	emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=)
-}
-
-multilib_src_install() {
-	emake \
-		$(multilib_is_native_abi || echo TOOL_SUBDIRS=) \
-		DIST_ROOT="${D}" \
-		install install-lib install-dev
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-		# the man-pages packages provides the man2 files
-		# note: man-pages are installed by TOOL_SUBDIRS
-		rm -r "${ED}"/usr/share/man/man2 "${ED}"/usr/share/man/man5/attr.5 || die
-	fi
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-	einstalldocs
-}
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 28dbb3de80e2..cc02623060a3 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,3 @@
-DIST baobab-3.30.0.tar.xz 765760 BLAKE2B 7003507e0923eedd709db8f3934c341215decb77b300b6660a334f6c23dfa6d83476d3c0a0ef3d76a5104a1add0759f7e268e13bcf00f69f51ae5b9986bdefc5 SHA512 3fa1c20e6e3a654d3dfa11b8f0a7e0dea77cc8ab88ff65a4471cd467d3cb3a7d2d39521be1718f3f6ab32984b9331332574f87f5fcaf13c1aa8cf93bd081d7e0
 DIST baobab-3.34.0.tar.xz 454960 BLAKE2B c9e695074711442418bfd9c9c1453feeaf573429f1d9a03ef6c542d581d39c5bf1cb14d98025cc522705b1f8649150f418d39c05cf06f77f5900780eb058f67e SHA512 e821ba445c65742e92580e12be9b82ff352c6a2a8a58bab7fba97b01a120a948b06e35459196f16e9eef347cc6c5aeacfd563e86d78c758099fbab2ecfc4aa0e
-EBUILD baobab-3.30.0.ebuild 745 BLAKE2B e665f3ffcfb7ddde241158137489380c020266c0bcff06e95177ecfbe0c116c2488ec45425ccc83ac5b05f3da73b0c835d6dda88f5149b74db03a611757c635e SHA512 cdd6edbba9f034572bfffaeba76d7ad1117ccd0cb4fb98bd43315f58131b0c501f6626a5bfb8bbd5042406733cb6f22f625c8acef761b377936a7b3b297f90e2
 EBUILD baobab-3.34.0.ebuild 745 BLAKE2B e665f3ffcfb7ddde241158137489380c020266c0bcff06e95177ecfbe0c116c2488ec45425ccc83ac5b05f3da73b0c835d6dda88f5149b74db03a611757c635e SHA512 cdd6edbba9f034572bfffaeba76d7ad1117ccd0cb4fb98bd43315f58131b0c501f6626a5bfb8bbd5042406733cb6f22f625c8acef761b377936a7b3b297f90e2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.30.0.ebuild b/sys-apps/baobab/baobab-3.30.0.ebuild
deleted file mode 100644
index bc167557c800..000000000000
--- a/sys-apps/baobab/baobab-3.30.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 80f9fc8aec01..c537afd48818 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -2,7 +2,7 @@ DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59ccc
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ansi_term-0.12.0.crate 22762 BLAKE2B 4612905fc52d4aa67b9443f49f2e967e63688df1dbd3c3fe40c19774ee214bba6dccdd185deae40ee97b5c4913d2849b5bb202a90e6ce91c75d10d4081041af2 SHA512 ca41f0a8ff75fdd5a1033589d95a52e89bbc7bc8a23aba161cb8f7d32f85d909171483917dfcfe7db2b65b00221e026380286fbd2baa735666b6793a1ecb5d7f
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
 DIST assert_cmd-0.11.1.crate 20524 BLAKE2B 1b9443fbe9bd677f03e4711091390697f5f7db575d02738a7911bcd80d9872922f7ab2c605507f49547b69fb34d150a6043e47aa44027e476e08b1c06cecb8b9 SHA512 146d3088d90bd22aff24ee37598298d45fb6775aa4f7eaf95d4bdb9c2e5cb5c5da31039ffe2a3833866c191de0ffd60ca9ba94757096bc1c24d17fd72f962c55
@@ -11,8 +11,7 @@ DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d
 DIST backtrace-0.3.35.crate 60047 BLAKE2B 716fc69b2a7999371d52792fae45fede5c3dc72c0522c0dacb275025cb97353aa0f8569ab8bad66105671babcd4e675fdf6f0d65153a83c5a0de9262cd275480 SHA512 bb4d50c57bda52b9f48772c1cdb1fb30c003a5c6d69cb5ae740115020600693b00aca7c89e8c76a5e3e0deb6e54a2ec4d68edcdebb85e3f35b8dbbaf23f88926
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST bat-0.12.0.crate 767284 BLAKE2B e2a0bc353bdb0b5b1b539a7d32e69e8de9c31d7a61adb8f1f78dbddade335165ef8ba765e730f88e17d98f79b2dfec03a15781d0220f1c96254b6d9d4b6fc778 SHA512 a16d0cedd248786ab928e4f4bb9ef17b6e58aff142c1aa6b2dd0fcbd2714b19023a277d5fc1234b72c05296bd7ac0e47a59cdfe20879b2e1231556f9f53d60b5
-DIST bat-0.12.0.tar.gz 874081 BLAKE2B 6be17ac0980306542153d6c6c9bb47179a25d146501ef31a5c97f1fdc6f6742f4a58f5ed45c82b268c064c88f21e63fc86d44db9e008988f360fd13fd1dbbec2 SHA512 94726f51675d513a3fa7e36f87f2e5bed3040960f53b0d6e316afd4e2014c96b27c93956fb092d69f35bb7f676886a939d61feb26810d4c57218501e7795e256
+DIST bat-0.12.1.crate 767343 BLAKE2B 5a79089076cad292c6ce74ee3014e74e736920e71a61379534181f74febc78ebf9a60e950658db901f67518a2681a502ace19cce53a1c0db5796441415d0845d SHA512 4577fe8fdbee2378c7efd178a53a0d247d8506adc7683999f6ce08034003b42d8ee3fcf5ae3dc88b1dd38dd4e717b1c3b265fefd639af0f0b6db7af33b6540df
 DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
 DIST bindgen-0.50.0.crate 180902 BLAKE2B 05c7697397c96ba8a089c0ec8c3cfdc78c9ec7d60502ad57aed0865551871850c7fc6d903a8dbe10917eff736f3f457bc420a3305f92910200d0120055cf3800 SHA512 3c1102ac91dd434bba7fe88c6a3463f62bac5d090cd828a6efc29a71125f6750133861d8bf128dbc5005bd5593e1a22c3b0371d30f38712fefbff23130ae5942
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
@@ -140,5 +139,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
-EBUILD bat-0.12.0.ebuild 3236 BLAKE2B 144232a257dedd5c950c36392de9673d4dcaa2900105d086a30bb0503211dca103d793cf034ee4446920ecc72bd9bde4c4a32540c2fe6bfbf38699dd7847b3e7 SHA512 494a163c00fe69318493ed99add67edc65acfb197add22786eda67520d6825d6389c368a61e17c882d4f4fff7710f6504d91d582b97608f37efb7142e3a722a0
+EBUILD bat-0.12.1.ebuild 3220 BLAKE2B 6a575f916e4d82c9a7f5343cb47ebb4a956f100066a9d6dfbfe954f12ebf86e10e155e92f6a072f2a59ebfbc9bdf7e1764eafa310fee686ccda7fe6b81c90e64 SHA512 84b2ccd807fe4c1a2d0ef4c21020eb9fb750a48bbb040335e45745caf461a647fcb61d5886bad08187f3edd47b432d166d388129b14180b2ac446b98f7009cef
 MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
diff --git a/sys-apps/bat/bat-0.12.0.ebuild b/sys-apps/bat/bat-0.12.1.ebuild
index b64e6923594a..eb91e0711341 100644
--- a/sys-apps/bat/bat-0.12.0.ebuild
+++ b/sys-apps/bat/bat-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ adler32-1.0.3
 aho-corasick-0.7.6
 ansi_colours-1.0.1
 ansi_term-0.11.0
-ansi_term-0.12.0
+ansi_term-0.12.1
 arrayref-0.3.5
 arrayvec-0.4.11
 assert_cmd-0.11.1
@@ -17,7 +17,7 @@ autocfg-0.1.6
 backtrace-0.3.35
 backtrace-sys-0.1.31
 base64-0.10.1
-bat-0.12.0
+bat-0.12.1
 bincode-1.1.4
 bindgen-0.50.0
 bitflags-1.1.0
@@ -151,10 +151,9 @@ inherit cargo
 
 DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
 HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="|| ( MIT Apache-2.0 )"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
@@ -169,7 +168,7 @@ DOCS=( README.md doc/alternatives.md )
 QA_FLAGS_IGNORED="/usr/bin/bat"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 	doman doc/bat.1
 	einstalldocs
 	insinto /usr/share/fish/vendor_completions.d/
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 2c812ffa1b37..9ff4dc39da7d 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,5 +1,5 @@
 DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135
 DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
 EBUILD bolt-0.7.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
-EBUILD bolt-0.8.ebuild 913 BLAKE2B 2ceb3d92ec71103944f10593aa0ea9c6881210f3da180af0a44283021df0a744816c569fdd7b8ce87c8764fd7a3d5288af2a0dd9efdeddeee9c7dcece671d533 SHA512 16af133d2c20ef18759cac989ceb1c1e0a7821622113853e910fd1f6d7441449630a2f2c650c869b37142c609c43af28e2b88553c5555f4d6120fa319c7c9527
+EBUILD bolt-0.8.ebuild 871 BLAKE2B cb0ddd4398f5a8d89404bf168e43be42000edc5b80a6fb1a80a56998d0fa91cc205e4f17ce18c7eac54cbd9cdf98814fa0fdc64f8d2eb3e90d8f07dd769a0580 SHA512 d085c3490f3c91dc42a768a41990824edb7d02b80cb1f53b0035d4b06136cea7c56ffd4734ebf81c64df31b02a9045c52cbdc968f18353564bb32b02c1758c60
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.8.ebuild b/sys-apps/bolt/bolt-0.8.ebuild
index 6e3dac6aa8cf..7adce26d5ac7 100644
--- a/sys-apps/bolt/bolt-0.8.ebuild
+++ b/sys-apps/bolt/bolt-0.8.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
@@ -21,7 +21,7 @@ DEPEND="
 	virtual/udev
 	dev-util/umockdev
 	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd:0= )
+	systemd? ( sys-apps/systemd )
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
 
@@ -31,7 +31,6 @@ src_configure() {
 		--sysconfdir=/etc
 		--localstatedir=/var
 		--sharedstatedir=/var/lib
-		-Dsystemd=$(usex systemd true false)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 3152564c6927..b0d1c73b14e4 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,7 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6167 BLAKE2B e4b40c7572a2da27f3f0ec3a61c1e90c5103a3e1c12d625ea94734c848f8c6ecaeba919d10650ac9f90bccef72a1479a025ae209b289605f3a3941fbdd248795 SHA512 c3483c8830bd72367f36f6331034a2fc1c3f472fd9a623af64481be76098f4bdbe2f2942104b42f8e4ebf4438da599b9898a6783a8c14fca6fc28ffd24ff49fc
-EBUILD coreutils-8.31-r1.ebuild 5714 BLAKE2B 370b6baa0ac298cf278cb0e4b26522b28db33a415553a091635cc9b0cfcce30568a324f4024037270eebc64702dbbb82b70c6eb5be0f4f9839c9ecdc437fe2e3 SHA512 3bf58f4dfc1c6a1cc6cbdd9a722dabb82dcf15b180cbb8a2cf7de40244101c5373e4255baf850beed7042763488c3d308dcc6f7070565485b3c70f6d597e1cbc
-EBUILD coreutils-8.31.ebuild 6183 BLAKE2B 87b09524c998b56393923939336c2b982108ecd72d83f586a5379ba1d6ac58c3255e6ebda378bf7510e397482e4a2a8d23945c42fb67a23817013c4033f6645e SHA512 175f58a9ca47cbd8d40dc21c33326731525d232b4b60097aa5de6bfc89479bb2d02ef02b1fc1c873d83a4a0832b9f7bea19c5144fe495cfebe55d1efb006029d
+EBUILD coreutils-8.30.ebuild 6163 BLAKE2B ce6b33773b09ed7751ed748bee42366031ad3ac50c95fd618bdadb8331dd815401f5485c2daadd8fc39dcb31d55375336290367a19a867de5e75fd6975e76532 SHA512 94fe07e1246f9babdf0d6b54e91aeee4568bc50a9a00897ebe0b54026086c3747258caa08936f28a4cc7b22b25ec14656e8dbb7ea945b64db286c67524abc7aa
+EBUILD coreutils-8.31-r1.ebuild 5712 BLAKE2B 9fa751739c527648f58efbfda15a2af81c7308e73c09ef1683561c90c6504f0c624ead9b7119f4d5e1083f3eb44a86927c04f974a41ee90a8c6555f310bfa732 SHA512 9be4ba703aa70d0a6779ace0fdf55080c689dd54528974066a97e0edf7580a304927ac47b0bf938da3c876261b2691cc8dd4922027f95cf238e1165b45a14d09
+EBUILD coreutils-8.31.ebuild 6181 BLAKE2B ab3e5469399458f81d1176841358c8d0061abaf4c15faa8a912c43701aed540352b192986cffede61d2409c1bf934e1b7ee2c3f92d20cb1e9664fe73c7799250 SHA512 49304878ecd4b9402c5316c2da4eeac7847adbe06dfe052403bd3e17195032f71ee3c3571401e6a0f40ba8da636ce93ed90c1af834eab3ddcb29721f6bb81063
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 9ae4f449d03d..0f5e13380cb3 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 2d9f4afdf1ea..643aa3aeeca6 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 11bcf3e5b620..565e641c8b48 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index ef4da053e33f..b5c215895c59 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,9 +1,5 @@
-AUX cpuid-20170122-Makefile.patch 1379 BLAKE2B 4a21e4dc20c71e81cd347daa4afd21599d35d70c2ff527b59fdf531909a2f80a9b953ab67f97537c486db18072265bf8d41eb7958d92a99c401bd003764e76f1 SHA512 b69b9913e56c20a117ae13fcb2ee5aed0b4379d40209f8046477c5b2abb247cdfc18d9cd048e0000aa145b4920f3eeacdfca534e80822294287119b04178a8c7
-AUX cpuid-20170122-missing-include-sysmacros.patch 255 BLAKE2B 7b7e2a80638627d78be8738eee9b8ef301d45ade835421f801ceca1c0752cd3199d3fff13053ef2ddac697fd729c9d6f703589f434e8eccf367df3d6684da8b4 SHA512 4d87f27a3b7742bf1ed0cb3556ae4da83f8c891858ab2facf1b17dcf2bca65e6b53bcab099196d9a0cd13d65b0de7bb1c1bd7559b260e1ac29da209998a0ba26
 AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712a9168b3d883614919a3e00c0bb671275b5227b9a4aebb8185fc27ccdfc3588db412a1234b0962987deb559c70a24afae580d04c49a SHA512 0e14946bf58eb009b65a8b849353b3940f8a13cb0a8ee1d53006b1e36e846785bad1bdeaab35e56b26faf08f5b8d81cf279cbc0de88fc5f13cb8471e8554c96a
 AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
-DIST cpuid-20180419.src.tar.gz 82301 BLAKE2B 6905c0946fb9a930c67718067923c8c238031539c95704664160efde8563b0f56aadf3132abc9833310846802f97330edff833b47c006a4f46fec49358b56e31 SHA512 c8e30e45df7be5bdbff7e449b447b4542326a112f563c114c67cc80764070f3f3815ff4f80ceb57360828061bc9fd5f2f24f8e53ae4db47781f36db32141c951
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
-EBUILD cpuid-20180419.ebuild 652 BLAKE2B 8d13819ec16878fe33fe6398349e72b0e81296128e29bd966a105ca42c835acd7f5f4507379ddd3489186b33daefe3e45c9668ad1a3bd21261ad77587122a655 SHA512 1c69a30c3500d95a1930017b20c6ba3c2b8aeb63d09d75ddf0c0c136b241a27bbcc546544758a0e9b4d079eaf34232a493949ef01713d68182f2d0333dae2db9
 EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20180419.ebuild b/sys-apps/cpuid/cpuid-20180419.ebuild
deleted file mode 100644
index 0d0367d2cec8..000000000000
--- a/sys-apps/cpuid/cpuid-20180419.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to get detailed information about the CPU(s) using the CPUID instruction"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-arch/gzip
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20170122-Makefile.patch
-	"${FILESDIR}"/${PN}-20170122-missing-include-sysmacros.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch b/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
deleted file mode 100644
index 9a02a54563aa..000000000000
--- a/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru cpuid-20170122.orig/Makefile cpuid-20170122/Makefile
---- cpuid-20170122.orig/Makefile	2017-06-16 06:54:32.993875817 -0700
-+++ cpuid-20170122/Makefile	2017-06-16 06:55:56.622875498 -0700
-@@ -1,9 +1,3 @@
--CFLAGS+=-g
--CPPFLAGS?=
--LDFLAGS?=
--ifneq (,$(findstring arch=i386,$(CFLAGS)))
--CISA=-m32
--endif
- CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
- 
- PACKAGE=cpuid
-@@ -51,10 +45,10 @@
- 	gzip < $< > $@
- 
- install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
--	install -D -s -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
--	install -D    -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
--	install -D    -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
--	install -D    -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+	install -D -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
-+	install -D -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+	install -D -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
-+	install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
- 
- clean:
- 	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
deleted file mode 100644
index bba18a3b3543..000000000000
--- a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604406
-
---- a/cpuid.c
-+++ b/cpuid.c
-@@ -30,6 +30,7 @@
- #define _GNU_SOURCE
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 15aa749c5b55..dce79b4516d3 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,5 +1,3 @@
-DIST daemonize-1.7.4.tar.gz 66005 BLAKE2B 6bcd1fb514d4ffaaa07f9c296b9ae4795aa4f2a2ab3a3232897e733d7c09f2727764b7c79ae4a254dc53ac3a7c77ed2ee16a537829827ae475ad6bce34315355 SHA512 aa5dd1d89650fc4a7e783163852de176877b0e999c4d16950a03a81c0db1477e2994fe8d97d8e2bd61baafb7810522754eade96f3ff0301c1e6ce74f9252d34e
 DIST daemonize-1.7.8.tar.gz 66009 BLAKE2B 323b98357c1750ae051378d8d432a4997fb3d162f65f102a3f7d5e1c0271eec77aad7f5253c4712209c9c2cba1c725b3daeaf1c240dca31be13990d3a833fbc0 SHA512 77cb7f6d41fd3484222831540aa8dedcd1f3cbb2f4be2a9b5e0bc1c848fb1392b616ff30b9ff3bb46f3decd1ff2829dbf7130887f81ed66a7cd2c710755a0836
-EBUILD daemonize-1.7.4.ebuild 593 BLAKE2B f8e7a3b6b40618121f7a990f6d953b8f60e1d78cff4c316d53601401cd514aa952fa312c5cab9218048ec6487dc1f40926e5620b1b73c4b111d47fc6c9c22360 SHA512 5df8000970f909dfb73200b254780a7598a1b08e262b6991ea2e1629a47f168c9307c4b09cac5bb8ed801b7a55057479e390bf36fb9d0e96a12a99576f053fa5
-EBUILD daemonize-1.7.8.ebuild 529 BLAKE2B 792525122f902ddd62fb0a41390586b173fcffb9533b70b1e10a33c1407fd0250ede85686401cd101df34d696c301381f1726202ffad332f19efd2d1357bc057 SHA512 61c046196f9a53a308e5414e1cde3b1d4aac9e4e5c9ff95ecb01dd178b10f19ff51c5c7a9737ee46d82af3f8fb2b05bef9becf063b102ead5458858784f9ffcc
+EBUILD daemonize-1.7.8.ebuild 527 BLAKE2B 9db600c45da6ce7a3ae3d313c6eb9b4c587b30b2acb7f0ff0a283f7f422b1b8ea281a39cc2fd9f709cd786c7ea82e8a62bd2bc61b67bf595a0e9e8df5a7d08e5 SHA512 891abb31a94ff492db6bf4d111ce3012c0d879e6d362f2a7d82c71042c15d8526e724b143aa25c452619dcc9b8d36ae7a03d2d74e90be921b8df608ce8ffaa45
 MISC metadata.xml 323 BLAKE2B 489ae3e56f15b64d9842744ff57160a94b16211ffed2abf3d0cf2fde5e53a65be5fb5e42cddee855838c76cd85b7dd6c62716b99d2451aadc74858c20b99c660 SHA512 fdddf9c23f5f171bd9c1c5f8ca98c61e8a1187b57b77a8a12de8e1d339f44d405e19b42330ef8e53f146798950eaef9e9a8e44849d8cba6aeb828db14d97113c
diff --git a/sys-apps/daemonize/daemonize-1.7.4.ebuild b/sys-apps/daemonize/daemonize-1.7.4.ebuild
deleted file mode 100644
index e16637d6c333..000000000000
--- a/sys-apps/daemonize/daemonize-1.7.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Runs a command as a Unix daemon"
-HOMEPAGE="https://bmc.github.com/daemonize/"
-SRC_URI="https://github.com/bmc/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS=( README.md CHANGELOG.md )
-
-src_unpack() {
-	unpack ${A}
-	# Workaround commit suffix from github.
-	mv "${WORKDIR}"/bmc-${PN}-* "${S}" || die
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
-		Makefile.in || die
-}
diff --git a/sys-apps/daemonize/daemonize-1.7.8.ebuild b/sys-apps/daemonize/daemonize-1.7.8.ebuild
index 16382e7c34eb..1af06b01514b 100644
--- a/sys-apps/daemonize/daemonize-1.7.8.ebuild
+++ b/sys-apps/daemonize/daemonize-1.7.8.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/bmc/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index cc6c8b78eec6..42314cf23eea 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,20 +1,11 @@
 DIST c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz 24727 BLAKE2B e18de53ac8014e77cffbcd9c71230847db0055e43e54b5cdfc3f48367570878b34d6fc7c299e4312708455ef2fa4ddff9fa5b48b603a05d6fbe28ce84e5e5906 SHA512 a006bdfc8a5a8e9a803ffa29f152858cb699cbf0e59d4f0550a4736ad29f85cfdef6bd8ef3cfbe8770045c76ed092db00c7338d62a8b0cd54ae5bd03f1c8b422
-DIST c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz 36281 BLAKE2B 4a1ee57e1aeec5010bd5b84d355aa94a923dc6e03f5cd1b58db3af9b64f15e9e565a0930e9e1d8ca79602ac7e366a3231ed66d7a2429b0ff769e0c3428742493 SHA512 b77ce063fbaf92d3ee4462eb440229870fe3bb41ea3d02e79502cca48eb8983da4f8e3d6fa29fb2f066879af0d7e9166e0105ca56d1ff12d47f2592f2be1b2e2
 DIST c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz 14094 BLAKE2B 49ac949d4fc46ec63f253d48921be0acd585b3d301d56144e9477baaf81a0cfb3fb5f0706d1673c921962d1bbbeb89b2d83e07dba9265dff7b1f57da6059eaef SHA512 eec3a4d2a3e1a4d9d65385b2e3cfd87dfb482b365731bc15f989faa59fb7f2c6e88abcef6612f3718817b1d1953f12fcc9981fc36b01fa82d3146305e24eaa16
-DIST c-ini-979a18fdd59f05f927d6cdf624d8ded6f81c6776.tar.gz 26116 BLAKE2B 23d6feca93bd48905745c8ab0ae5798be315e79fe189e1f8d181922db0a2cfc9cbef8e250796bdabd46fe8cd434010912ddffbe280f99a0967a6ef0ef68e263b SHA512 a17f1202ee019814251d0d4225ce41fad471cd7d40f2f0c1f80415562019305cdc98f903f37e47a1493f7d135b656210b61b0718a0d19d65ecbb0d24496e785a
 DIST c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz 9383 BLAKE2B 70f8ed083a784a08da3b5d5fe75709cf9dcbaaee523ab9b1cd3b36931f5bb0c1e920cc38561c002f4de2efeda7b4edaf9b5fb9411f0fcd8aa1055ab966066789 SHA512 4db91e8af837d6739b9becbc2b405300e2006a82e39c01ade015eabf39ba550dc38879e800fd415bc5fa4ac220090cfdfa3a13d4f748a1278e51544c4a6183be
-DIST c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz 21457 BLAKE2B cec1ffbc7591479c8a7b1fbbfbef69a8dfc8b756a864f31910202967be431027d85191b4f412f04507152d5d81113e3668ab1e22319547607d21a139f75ea4a5 SHA512 0b0add65248cd17a5d3c52adf3f709ce8a7c5739f153516fb9577b0a44b709242b3571637efbaa0f78f0afba2691ec0993561b1fb643df4d1eb6a45167f50473
 DIST c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz 26065 BLAKE2B ec5486b2e1b9b835a3aac42b9f87275bbdbc73cdb0698304db01a80f0d52bf542b8df56d6e58bd98cbceccee9418d7115e90605c8077ac8670b6326304806c9e SHA512 8177c111390f8491a3b535ec5a3b8de13a3b9d0358166494e503d68bd5748dae0cd2b092b0311258be885ecbeee2bb83a2389d9734bc28e4f78e85de3ed9b3f5
-DIST c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz 37838 BLAKE2B 5c40f444f43cb2f76c60fbd3ecedfb084ca39e90db9a297d630f6ca8ef931e52917e1ef1bd310d1024b003a37214d6549dce6f3d2b49f9b7e1f19441d04c64fa SHA512 6ac8e0eb7b704e2dfd1b69f9dd20ad08d490d13bcf7198d30825d5c8fb20d001998df3e5beece7346a1bda4341c900f63e3c67da9648ea8492607851946a1265
 DIST c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz 10824 BLAKE2B e2cc32acdb83a9d2c759d5068ef69feb4b0fbcdf908bbce08c9229c26dc1d1d421e522b844232328b62af851ebb93cbdc282be04b26ec04e327eb59e9e5173c7 SHA512 8f5ae3554239d42ec50b093f81b13715a55215b406a2000853da5a8581a11650ba1020f06eb8f7551d0ec372e786ea6cc56c2c803d0fc86d016db69895b391eb
-DIST c-shquote-b7e325c7ff098787f2937dd91597677374f038b6.tar.gz 22764 BLAKE2B 9fd0c7e17c7dc3614748e54125bc04d34c03c97f6ee148c66e2398827872e005aaff3326fdca32e01efcc04efdcc735059070e50fb0b5a5a6cef80e271110fde SHA512 1403bcc57f45df33509d7e9c03e964cbdbc5bb8dc3c853e6fd6bcebe304bf7c21e4f887ed471cd9cb4a8aa6000d7017e8ae02adfdbb43cdeac6415a15f29fa40
 DIST c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz 13215 BLAKE2B f8022583c224e911ecf65f10f1ada2ae631f0dca1c0306c113a2ad1b6a996ff4fa45eba14fafa5146feabebef0ae9e275a46fa0bb78af454fc37e49c465c7e3f SHA512 7c0a5d1266462482674f9fc98ba19af65566d638e7a407969de9ccb66d5884692e0562c16b37e64269919e5c0d0c2a8ffd147e88159b9226f1bb738d460b78b8
-DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
 DIST c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz 9480 BLAKE2B 206d1b74a187e56cc1dbc6a657eb0935cbc4bf5344d4567b5aa99f0f3c559eb442e6ba2f05647f6fff1244874d64aca36062ddd290e368c4ca933802046165d8 SHA512 5b6c0de7d5b3f2a563442ca139ee1ca788a137cb0f5eede6c6e190e748dbe39b3489a2446682e1049dd6c91fdafff7743c819113eaedf370f4c3b1a28e97b22a
-DIST c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz 21611 BLAKE2B 17ae3aa209361629e02ddd8d2725da85cf54c06d8c27ff706d736b130a854711efbeacce87f4cc20703dbeb8479efc6c4e67e9196d65b0f92e41a67a6d0cf987 SHA512 c868587efc0d14ff13525edcb4149f84fb9ac7a4cd7ef5e29fed9f374436c36ff318d54a4d2555874ec06ec60b40eb6399ada1fb32daa023727694d0a4a6190d
-DIST dbus-broker-18.tar.gz 190294 BLAKE2B 0af9646183ac0942b5137a93ee2d1ccfcb7e59c34ef17566c52afa51f0b4b408a8f8a5864865528c12a448a7dc08a6ed1fc50e187b28023e0955b20788a52844 SHA512 fa175fb64b70e9c46ad6527bc0c3793929b1813cca81e55c358a09fd997de33bab3fc430ef943b9d57eb5cf66dfa52f42cb94a0d3a465ceba37ee78b1c0bd33d
 DIST dbus-broker-21.tar.gz 203390 BLAKE2B 9024c5545b4a09ce43ef44f7bc78ceb52407047f88f73575c60b5ddd6f4fa188c0f65c23d787c91679d1ab2a07f8e19fa06b8a1b60b327a0cc8d79a6006ba50e SHA512 527a8b5f27458a6443c7a5ad33ac39e4e31b32348a3b4cfd6679acd9de635add272f182fe8f72b493e0812ff6e07523a35e53507f3656d05b56705ed8a00e643
-EBUILD dbus-broker-18.ebuild 2422 BLAKE2B c0cde0ded44a524006d55b46ca6c2ff64f85948ffbd008e5788c085b25d66aa02834ce55313aa08630d86df012b9618dff81db78c55ac89a2ea4183e0433e9ee SHA512 652da9f7d80fbfd991ee73f9ad37a371e69983bc5732a6b0c475f2f610f3b35b679610329a0a7b829a598367374fb1ec19c075e9a00df437dbf15d3116f4e550
 EBUILD dbus-broker-21.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606
 EBUILD dbus-broker-9999.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-18.ebuild b/sys-apps/dbus-broker/dbus-broker-18.ebuild
deleted file mode 100644
index 12db86f7f160..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-18.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
-	dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46
-	ini=979a18fdd59f05f927d6cdf624d8ded6f81c6776
-	list=dda36d30c7d655b4d61358519168fa7ce0e9dae9
-	rbtree=bf627e0c32241915108f66ad9738444e4d045b45
-	shquote=b7e325c7ff098787f2937dd91597677374f038b6
-	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=b245df543717ee19ad398f8139447e3807c11c96
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-ini/archive/${ini}/c-ini-${ini}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-shquote/archive/${shquote}/c-shquote-${shquote}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
-		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit doc +launcher selinux"
-
-RDEPEND="
-	audit? (
-		>=sys-process/audit-2.7
-		>=sys-libs/libcap-ng-0.6
-	)
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=sys-apps/systemd-230:0=
-	)
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/docutils )
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/c-{dvar,ini,list,rbtree,shquote,sundry,utf8} || die
-		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		mv "${WORKDIR}/c-ini-${ini}" subprojects/c-ini || die
-		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		mv "${WORKDIR}/c-shquote-${shquote}" subprojects/c-shquote || die
-		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
-		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Daudit=$(usex audit true false)
-		-Ddocs=$(usex doc true false)
-		-Dlauncher=$(usex launcher true false)
-		-Dselinux=$(usex selinux true false)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 385fb4acc590..3faf32019d21 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7829 BLAKE2B 57cc96b05985fbbd376cf899f8e5ebe9a86f6a0cf1f484c533483468133559a9f9a6249f16477d775efe703e08c9e40b56d0b3c380ee314315419e7cd10b954b SHA512 b99fe368708a48969d22652cf0e306d791269063b09a1dcb028ac702520161eb88da882fc01cd16247f5af95f865c32cffe20df6d9ae9f4da2994fe840ca6a47
+EBUILD dbus-1.12.16.ebuild 7340 BLAKE2B 18cbe78a7964a37ed3c63329a2f5226a57a2dbb8038e411baf93de9498b17c1112a934b157e02b60542a9f0c3162b2afddda08fb79a53c8a2833e069091dd717 SHA512 2773dee02e1ab776821acdd071c7af597553088e7cb69e5fded93968743ecbc5f73e3d781f68bcc55b57814bfcdd85ffc7438819f7dbbb244fee8c89506dc17f
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index f4be11b25cea..1813c1449ba8 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
@@ -271,16 +271,4 @@ pkg_postinst() {
 		elog "the following to your environment:"
 		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
 	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
 }
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index c9b41c1ea325..72257d52060c 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,3 +1,5 @@
 DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
+DIST dcfldd-1.5.tar.gz 81661 BLAKE2B c1037c8948bfa78704279b438f4604c8b6383d3840947c0e8e0a3ea52ba2b96fe0958b38e700675be97ec2bcee4fb6290f94a847476e3536fdd2790891d02cc9 SHA512 4c91211bf10fec409abe930fe67ae73ebfa67b5a29263cc2b5de7bc42df51f4c7d0647261e31bdad96b591f947c2f0e951004befe296fc37957ce5b56756debd
 EBUILD dcfldd-1.3.4.1-r1.ebuild 388 BLAKE2B 25a759b95addbfee2fa6417aac011fa5359a04b9ffb1b6ff71722f1aa9019d823d9b0a8036d3f7ea3e45863c9e4f43b0acec4ad6e9eef894be434104c5138cab SHA512 28a07c933cce37cdedabefcfc14acac0d07518de54821959b065d007a1b591f69cd58484eeabc9d760812b9a8592061945b50943f0602671551a8bc5a89e36d9
+EBUILD dcfldd-1.5.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
 MISC metadata.xml 243 BLAKE2B f8089442435627fe2c9fe0a53eb8637e58f37e443e0a12f8a62a96fff8bfabe3ce5d8744c4e54fc3dabe665ad2cadc2fe45cb6fd622cd5a5985767728651feee SHA512 8bec7ef7efabb34196784b71ed7c96e2c2e604665ab3ae6ce6f41e6b719e7b8fc4579e2ec6effce2181017d12784651019f5464623dfbc4f0c9b0437c2bae182
diff --git a/sys-apps/dcfldd/dcfldd-1.5.ebuild b/sys-apps/dcfldd/dcfldd-1.5.ebuild
new file mode 100644
index 000000000000..83b8567efac5
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="http://dcfldd.sourceforge.net/"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 33b564bd3011..30b6b488a982 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -7,4 +7,4 @@ EBUILD debianutils-4.8.3.ebuild 913 BLAKE2B e0549e48cdb31b2b1b12b03b6462aedcc5a8
 EBUILD debianutils-4.8.6.3.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
 EBUILD debianutils-4.9.1.ebuild 898 BLAKE2B 4bfa4e9ffdd8553d61774d73fe19a06c4d29e073ab3e907a92ff93eabbf8290187241eb788ddcc91c97f27c2151ba2361a4284579b70f70c6f2f1c5e89473ea0 SHA512 d5c25f98f3c07c757285d34f869a9057b487d1aa070768cde2289ede5e05dfcb54687f6b3e91552861263854ea0a2b58d5babe4265af56f71ef2ef56485bebce
 EBUILD debianutils-4.9.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
-MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
+MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index f6690ff31371..1c1ee347ef1a 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-		<flag name='installkernel'>Install /sbin/installkernel script (for Linux)</flag>
+		<flag name='installkernel'>
+			Install /sbin/installkernel script (for Linux).
+			installkernel is required whenever a kernel will be installed via make install
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 8c455b2048af..cf705ccf82e4 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -4,4 +4,4 @@ DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d
 EBUILD duc-1.4.1-r1.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
 EBUILD duc-1.4.3-r1.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
 EBUILD duc-9999.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
-MISC metadata.xml 899 BLAKE2B 390fd22c6c48feb24433dee58f2f7b96ea75ea41fd77e35222e68f8cb7cb5bafb694af00074a98c0a18a50359ce635fb814de4d12798c5349a1ad8cc99880eea SHA512 44329c606478e5335f5566e9a2b8660e4135c77e25c769916fa0a10129a097eec1820e154bcf6edc785c579fbb8273e21d8b36d114d077f642f9cffd4df56c6f
+MISC metadata.xml 836 BLAKE2B 4439120d5761b4101a201d2d6652ee8b06354bf05abaff97d0777d76d39d884df28532a3d321e018ec61cad2eee0fe207516dba2ec47fd659aa5b47ce069042e SHA512 36e1f82c58b004b86968d31a02bb3ce1740b409669d8bf5ad8d57a7187e2fa376115469b77255f732141aeb16cfa3be55094d130cf1c1a8fe2a479d28fa951b8
diff --git a/sys-apps/duc/metadata.xml b/sys-apps/duc/metadata.xml
index d577149cbb02..729eae15639e 100644
--- a/sys-apps/duc/metadata.xml
+++ b/sys-apps/duc/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cairo">Build support for exporting to PNG and PDF with <pkg>x11-libs/cairo</pkg></flag>
-		<flag name="gui">Build support for a graphical client</flag>
 		<flag name="leveldb">Use <pkg>dev-libs/leveldb</pkg> as the backend</flag>
 		<flag name="ncurses">Build support for the ncurses client</flag>
 		<flag name="sqlite">Use <pkg>dev-db/sqlite</pkg>:3 as the backend</flag>
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
new file mode 100644
index 000000000000..80defb4639ce
--- /dev/null
+++ b/sys-apps/earlyoom/Manifest
@@ -0,0 +1,6 @@
+AUX earlyoom 122 BLAKE2B 1e3e121135740b4f56f6929d1389cce42374db03713e7c5c6281a422f0f6ba02db3f04f8d9a72f19c8853795b4debcdf2ccffcdd4f095f425b620e931d51a8c4 SHA512 7dfd1c8aff690d2ed7137b250deac4135c48ca5fd04390468b3ea1569df81316f009e5c70175734c9f8dd21e46a13015905d3daaffe76d67eef936cda670e305
+AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18e8ef72d3dba8c20c8d617b06cc30c95d4c913e07e0e9a9e6fc6f095591538b8b37d7c72e7ac90f9b49f6a4706051280 SHA512 e906c6c4f7d835fb43f09d3c701a1d78b8c2d1e9642d1b7512a2e90094fe41b8f9a811da94af38f5442a976351d6cfd35557ef40a685466ea6ba80dcef5293a1
+DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
+EBUILD earlyoom-1.3.ebuild 958 BLAKE2B a2cb8950f6baefbd6a6d5e85d5f84ac91d9950e66b7fe91c8208a46752dd7983ca90115ba5c6498bfbd7c8f3786252a215df839b0f10ec5b8acc962a65ea45f0 SHA512 a3a216d37067e10db2a9565f42199c28b4c8be950ada0b9d830b1e8645a99cf4150956a9d7aa8536bb60249e57da89a9c668c8073ab5e95f221146a913e745e7
+EBUILD earlyoom-9999.ebuild 886 BLAKE2B 2a826285761d7b737840541c41998cc3f9a742603132b9b464a86f6f31938c37308b1b5301edb604a6d982e6a7b7902372c36969f265e01f6579fb4580eb3c40 SHA512 cdf81c10989a8fa171b57d4865c58789801224720383aa9dd1993a6ff560a90900fc22b7cfdbc6845d285ed365d0df59fce4439fc8b160a2f0355e239296cc54
+MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
new file mode 100644
index 000000000000..3234d956e495
--- /dev/null
+++ b/sys-apps/earlyoom/earlyoom-1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Early OOM Daemon for Linux"
+HOMEPAGE="https://github.com/rfjakob/earlyoom"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="systemd docs"
+
+DEPEND="docs? ( app-text/pandoc )"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-test-fixed.patch"
+	default
+}
+
+src_compile() {
+	VERSION="v${PV}" emake earlyoom
+	use docs && VERSION="v${PV}" emake earlyoom.1
+	use systemd && emake PREFIX=/usr earlyoom.service
+}
+
+src_install() {
+	dobin earlyoom
+	use docs && doman earlyoom.1
+
+	insinto /etc/default
+	newins earlyoom.default earlyoom
+
+	doinitd "${FILESDIR}/${PN}"
+	use systemd && systemd_dounit earlyoom.service
+}
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild
new file mode 100644
index 000000000000..a54b0d570f73
--- /dev/null
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Early OOM Daemon for Linux"
+HOMEPAGE="https://github.com/rfjakob/earlyoom"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="systemd docs"
+
+DEPEND="docs? ( app-text/pandoc )"
+RDEPEND=""
+
+src_compile() {
+	VERSION="v${PV}" emake earlyoom
+	use docs && VERSION="v${PV}" emake earlyoom.1
+	use systemd && emake PREFIX=/usr earlyoom.service
+}
+
+src_install() {
+	dobin earlyoom
+	use docs && doman earlyoom.1
+
+	insinto /etc/default
+	newins earlyoom.default earlyoom
+
+	doinitd "${FILESDIR}/${PN}"
+	use systemd && systemd_dounit earlyoom.service
+}
diff --git a/sys-apps/earlyoom/files/earlyoom b/sys-apps/earlyoom/files/earlyoom
new file mode 100644
index 000000000000..374c0d1af231
--- /dev/null
+++ b/sys-apps/earlyoom/files/earlyoom
@@ -0,0 +1,6 @@
+#!/sbin/openrc-run
+name=earlyoom
+command=/usr/bin/earlyoom
+command_args=-k
+command_background=1
+pidfile=/run/earlyoom.pid
diff --git a/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch b/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch
new file mode 100644
index 000000000000..8c6fc3ab6df5
--- /dev/null
+++ b/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch
@@ -0,0 +1,34 @@
+From 3648b351e88331f3f2e46af4ae0ddd19e27bc7c2 Mon Sep 17 00:00:00 2001
+From: Jakob Unterwurzacher <jakobunt@gmail.com>
+Date: Mon, 8 Jul 2019 21:07:04 +0200
+Subject: [PATCH] tests: fix TestCli failure when all processes have badness 0
+
+On a machine with a lot of RAM and no big processes running,
+all processes may have badness 0, and we will get
+
+	^ new victim (higher vm_rss)
+
+in the debug output, but not
+
+	^ new victim (higher badness)
+
+. This is not a failure.
+
+Fixes https://github.com/rfjakob/earlyoom/issues/137
+---
+ tests/cli_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/cli_test.go b/tests/cli_test.go
+index 7085290..ef4abee 100644
+--- a/tests/cli_test.go
++++ b/tests/cli_test.go
+@@ -72,7 +72,7 @@ func TestCli(t *testing.T) {
+ 		{args: nil, code: -1, stderrContains: startupMsg, stdoutContains: memReport},
+ 		{args: []string{"-p"}, code: -1, stdoutContains: memReport},
+ 		{args: []string{"-v"}, code: 0, stderrContains: "earlyoom v", stdoutEmpty: true},
+-		{args: []string{"-d"}, code: -1, stdoutContains: "^ new victim (higher badness)"},
++		{args: []string{"-d"}, code: -1, stdoutContains: "^ new victim"},
+ 		{args: []string{"-m", "1"}, code: -1, stderrContains: " 1 %", stdoutContains: memReport},
+ 		{args: []string{"-m", "0"}, code: 15, stderrContains: "fatal", stdoutEmpty: true},
+ 		{args: []string{"-m", "-10"}, code: 15, stderrContains: "fatal", stdoutEmpty: true},
diff --git a/sys-apps/earlyoom/metadata.xml b/sys-apps/earlyoom/metadata.xml
new file mode 100644
index 000000000000..40cd1829d964
--- /dev/null
+++ b/sys-apps/earlyoom/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<use>
+		<flag name="docs">Generate man page</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index c360e6b579a8..f57d4dac55d0 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
-DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
-EBUILD ed-1.14.2.ebuild 904 BLAKE2B 7082d93e7f0b4d25de048276203d0a7f86ded0523102a2ebdb6cfe09fc3ed095e54e833b5acfd8f8246c1e40b3915b01b0794b686fcdad98d7cbf5a66d3103b0 SHA512 5b9a117adaba19625076775d724ddb85830c974bafd748b03bf0ff71559ab8d44bee7f2a08f3df712f16fb9fa12a273417eff473e2059884361b4e9433c424bc
+DIST ed-1.16-rc1.tar.xz 68492 BLAKE2B 8a47c6147203b19954064b07e733719a534f4e5cb8cf5f6b361ca926cb6d55127d70cfa9c176f65eda2988c2b9f9ca2fcf5be27e109f83ccfd38d1927830c76c SHA512 17bc689c1aab357597715e0f2a0c222296e5cd999e04084953ff943e66fa3e7e37dbaffdb706c92daeae625967541cd41b390c4d883f54985ca924691ece78b0
 EBUILD ed-1.15-r1.ebuild 942 BLAKE2B 6dec1af6c4b3b21874740f6fb52492fcf6a981bb6c5838904a886ac4fc7e584104c643ab2477f0274e13f7c4da7084dee78c7529eff2cfad3c6d5b7283af8630 SHA512 e09eb537edc7cc9635b409ce104cfa64f49e45acdfc0d8068ae071cb9314a4cb563be8852eaab04866dee878dee5225bd36b73f4bb82502a880dc1ba49eaad8e
+EBUILD ed-1.16_rc1.ebuild 1032 BLAKE2B 36a3b62efc27129d34fa5305d84e46128f49112a3fe435d2a9142f6737d58ab58352c6f0ee22ef3759c57d0659fe4408d1a01fcb4f4809cf81d2bff1c44f7cd9 SHA512 57274e1af3db76a5065c12acd76bcac07e6b353c56ce5990d6a736a192d6f564097778efdaa9e4f791edc1f797900df21296201e9ccebe72d9f27bc3520fb7b9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.14.2.ebuild b/sys-apps/ed/ed-1.16_rc1.ebuild
index 5b5ab04712cb..a6f72b9487a9 100644
--- a/sys-apps/ed/ed-1.14.2.ebuild
+++ b/sys-apps/ed/ed-1.16_rc1.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
 inherit toolchain-funcs
 
+MY_P="${PN}-${PV/_/-}"
+
 DESCRIPTION="Your basic line editor"
 HOMEPAGE="https://www.gnu.org/software/ed/"
 #SRC_URI="mirror://gnu/ed/${P}.tar.lz"
 # Using gzip instead -- the filesize diff is small and lzip uncommon #545344
-SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
 RDEPEND=""
 
+S="${WORKDIR}/${MY_P}"
+
 src_configure() {
 	# Upstream configure script is moronic.
-	econf \
+	./configure \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin"
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
 }
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index c640517af892..1d1f5ccc492f 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,4 @@
-DIST edid-decode-0_pre20191207.tar.gz 56644 BLAKE2B 85869293a3f47558f0e1c7dc22e482299cfa19ad62bb4801aa03f303a7f4e63f4a8424fdd177fbc9aa510183283322d68b519e8436648d763e7b983e490a39e4 SHA512 bbbf98394409f6bb043e67be0a91b4aa0a596b3f10d5e8b033597fac723b98df3b57e5ecc591a5dcb768eb98cae8390474000fb67ca82cf25d617652bd835ba1
-EBUILD edid-decode-0_pre20191207.ebuild 690 BLAKE2B ff56c136cd30ee131d5e8a91886054ff6b497955ee6af9b1ef319e93ac19a8ce1ee96f5b181d29c8ec42416f5376fd4a8e485c0a56914ac8cdd174fa5d496c7f SHA512 a747f1bb0ca00d23c28c54aa57d48a2be1ef93199cf47ed146270ac6d196a2ff0a4fe86138d8f8adcb21d679eb7b169030f637e39a68a9b8f3e13edc8060903f
+DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
+EBUILD edid-decode-0_pre20191209.ebuild 690 BLAKE2B f51940119b91b70f9fcb64f16de02e152bff13386533fc0da9bfa5319239cef57af8eb9895916328c74cdb98f0aee98d0fec86d8a41d0a3051645b321a878a8b SHA512 416c5afdb4a485196aaab49a0fdd2b13bf83d304c1e228f0dc60c46b0b5285ad52fb0a50913684b03bd86fa51a030425e4681bf84099f652aae629d791fdfdfc
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20191207.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
index 782193f55c43..7bfeda7710dd 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20191207.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-EGIT_COMMIT="46a0691551e44d49a2c3951a7d944786131c97c3"
+EGIT_COMMIT="e719d04077d098eb51d9494f41060eba2419d4bc"
 MY_P="${PN}-${EGIT_COMMIT}"
 
 DESCRIPTION="Decode EDID data in a human-readable format"
diff --git a/sys-apps/edid-fixdim/Manifest b/sys-apps/edid-fixdim/Manifest
index ae2e5e2bbc3d..96fdbad715bf 100644
--- a/sys-apps/edid-fixdim/Manifest
+++ b/sys-apps/edid-fixdim/Manifest
@@ -1,3 +1,3 @@
 DIST edid-fixdim-1.tar.gz 3236 BLAKE2B 4ae6954fa4c93f143be5e84f364f4b229054bd385aa0bc2ec85b4dfcd2eece8e5e3f1a4039188fcb3fe979f0de473b6c876c73e9ba642d0e10f8656d62c36d8f SHA512 614908e2ca94c97cb998f789ec383a72237c5be4544cf8b02d7754817bea90de87993acc11d917c1c5b54009ca8f41560e7468d97dc3f21b7e2891a36d4dbffd
-EBUILD edid-fixdim-1.ebuild 534 BLAKE2B a24e479d84dfef905beac039fdaa85c6b72d214e6e891bb7e3a87f35652637f00329efa49926700263ed9a22afd64d361a30e762eac82048f9152b999cfbb209 SHA512 d9c236adcdfc31b1fb0c4b6dad02bbef4b12ac09d26074441c140e14b1cbe14ca52afdf115eca9625ced1a005ed142e5b1c2fc03e7792bd0185ab55d6164f3f2
+EBUILD edid-fixdim-1.ebuild 532 BLAKE2B 2428bfe0f66da7ed0d64ea91fb39c9d7799693f5ed67fb1080cc97b9e12e020bd8d4fe5619539d78f14fd1ed311237c5af89d33ae3b2f37046b48c88cba8f64c SHA512 57b2061b709d3e370ea1ce449785056da6009d0d45443ed0d9c57e1fafb5958e5c31c33f1af02c024745123f5dd2784780efdc45b9a75dd0d102f222f22a6c00
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
index 4d90008faca8..67d4e3603638 100644
--- a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
+++ b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Tool to fix screen dimensions in EDID data dumps"
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index 90249b4094a4..a9119d17a032 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,4 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 BLAKE2B 6d60bc5539e9c2bd174dc77f34f061f0a351c7ae8026659dcdcab463d2b5fc8dafa35c0ca76ed2e591f6d49c1e58b66766898e7ce774297d053bd6def4378edc SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451
-EBUILD elivepatch-client-0.1.ebuild 613 BLAKE2B 61da61ee9f885e71b949692f96dc19a251092efb67d98ec51defb901e5758745fbd96904382e9aaa4135c17dd911cf98b0853313115b19802d70d5b5d0021920 SHA512 8a49b85afc4ac25a31b68b6fbfe9d9de64f9c86ceab4f0f175f483a6d3a6baa0688f6dbc9bd3bf80f3ebff1328ae574ba3e7fb4b35fc68d0a31be779e9a7a3d6
-EBUILD elivepatch-client-9999.ebuild 735 BLAKE2B e2e6ba0e98e0d6b73a67b0c9673ff55d924e7789ff4a651b0982e36762fb03bf2cf8ac020797e552c5018d8bdefc09d1726729dcb84a4bf4f8a822e8ff8734d7 SHA512 8a985d10418518e636154c107fd8c0a66085fc25133da0a5116a9f326e5268e696d0763dd389fd4c43ddd94e32b8f9df2779cf4fcf308bd365d251ca1867ca81
+EBUILD elivepatch-client-0.1.ebuild 609 BLAKE2B 5b1520592b01e7485d9e68a03cbf8e84b3579fee479e5eb3cc8741543ffe4041e3cc4a8b7921f12fb6f8f43e042f4046a17ddb233b875446a246b98df7fb426f SHA512 254587e75b96720b63f3cf14db834f80f8950c4642a34ab7fa2d49b114e08c1f60879c9aba9b32cfb1b0e7783d900282a75f33ead274421e6e20beec29d7d64e
+EBUILD elivepatch-client-9999.ebuild 731 BLAKE2B 86a07c88b2d06ff23fcf599cd3acbdd8fe2afaad2a7a7e4261153efb13bac1e77f5daf2de6c13c2284fb99ce4ea5143214b03e7c79df61b16a72a84b51c80299 SHA512 09e67505ca166b7d55ea48019953d9d7d4982561e01638fcc3e244942c7cc4a16eb3e56b2ad914db5db49fab36ab7c42a9e2cfa1f9ca3f341bcd94fbefbb2089
 MISC metadata.xml 311 BLAKE2B e6ea1b04433934bf6df08628f644783f8fd80234e06fc8d1c692dd1ad1ba1c66ce1465c2871291ef7b18dd02e3803fefd31ce1615fc790c22295da47f3b42d88 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
index e91f470e11d9..54da6b5385e1 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
index 80cc215857b1..0ed53b984fdc 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
index d74cbc40023f..6f239b03e3b5 100644
--- a/sys-apps/elivepatch-server/Manifest
+++ b/sys-apps/elivepatch-server/Manifest
@@ -1,6 +1,6 @@
 DIST elivepatch-server-0.1.tar.gz 11564 BLAKE2B 0b1a9c518ba51ffa4fcdf0d5d0202b182464d13123334583e8f647be4c8ff48c9d7471fcab8a18d2ddd27172928942e4645c75a1976b25a521c7f1caecedb0b6 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb
 DIST elivepatch-server-0.2.tar.gz 14198 BLAKE2B 1e48626dff5cf0ed5e7e3fb09dec54fc0e203be58646a62419df901c8b96964281250c613ef06cca9ede32ce7f4e384094892a79033afa0d20b133c54a4cc5c6 SHA512 1af4c6656b32491d82c0c98ed53a7184bea4a2639d6bf6072c3e8ae3f0d12c09284cdb6f96129b1ce848872946e14c6b83d3bbe6eb959cd5c918575ed42a621a
-EBUILD elivepatch-server-0.1.ebuild 777 BLAKE2B 82ae46283d444cf00d6bf911f466cbc4fade0e6bd968a0c6198ef181868496b42289e1b40355d1c739243ce71b21661e1c2cf9c116a5af6a7d91c6260116a56c SHA512 ba9ba6e33edfb7ab038f8551ff6c9caa9bb5142c991b98f4b689fd6610ebad49c54e342d89e206e6149f18c37035d6b6a6303bd3faefe4be703f4e85a23c61b8
-EBUILD elivepatch-server-0.2.ebuild 777 BLAKE2B 82ae46283d444cf00d6bf911f466cbc4fade0e6bd968a0c6198ef181868496b42289e1b40355d1c739243ce71b21661e1c2cf9c116a5af6a7d91c6260116a56c SHA512 ba9ba6e33edfb7ab038f8551ff6c9caa9bb5142c991b98f4b689fd6610ebad49c54e342d89e206e6149f18c37035d6b6a6303bd3faefe4be703f4e85a23c61b8
-EBUILD elivepatch-server-9999.ebuild 924 BLAKE2B faecec5d5947925b6cdb21a55fecc7070f3fbd16f63d90b18efd812ba7f15d3c2b7c682c84541b3346bcbb525449bba624f55a538e507311a0b69e5950a15433 SHA512 e45997a907c5a67d411342405f1a3bbd221b1c65bdbbee811605f54faea5615d6c6290ad3ad8b88d59a286933d8027c52e3f717f01710ca209c5a3a3aa2bfbba
+EBUILD elivepatch-server-0.1.ebuild 773 BLAKE2B 1f6dd0f706538fa9a95e2c5c4beacba23508c9e27a8173a1f84f36dc66ae8e76c8fd656f8edc6427481c9b7bb2a5b64734b58caa43c18bbca0cbbf14c6484035 SHA512 5d4d5b0ad96e6746fc935b0b4f56d0742d63cff64187e1cc0351fa8dbc22865de5c476285c7c8a546657136a25d8ab660d2178e76ee8c8313e85474cd6c091bc
+EBUILD elivepatch-server-0.2.ebuild 773 BLAKE2B 1f6dd0f706538fa9a95e2c5c4beacba23508c9e27a8173a1f84f36dc66ae8e76c8fd656f8edc6427481c9b7bb2a5b64734b58caa43c18bbca0cbbf14c6484035 SHA512 5d4d5b0ad96e6746fc935b0b4f56d0742d63cff64187e1cc0351fa8dbc22865de5c476285c7c8a546657136a25d8ab660d2178e76ee8c8313e85474cd6c091bc
+EBUILD elivepatch-server-9999.ebuild 920 BLAKE2B 173fca42e2292523f975441900a39a84eabd113df716f58955b7e2407e90863477b1c9caa5ec95e075089bb5688b9d853675da4deeec70069aecef01bcebce12 SHA512 fb3400468e6e527aa3fd03023da100132b7a7187ffae09daa4dd4d9382f8a9d800b3b6b083985ea174cce389ec545be544b1eb3e1b67e87b10271b88c1ba8213
 MISC metadata.xml 311 BLAKE2B 0394811b976f9903cfb643f6b556fe834d6b6f9a9b981e710dd64ed0128dcb1a69fe532c750c24103983a24c87bd5eceb81063fc1d3e606b46cce1bdf65930b2 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
index 5707a104f427..1f2ab25b821f 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
index 5707a104f427..1f2ab25b821f 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
index b559b7589efe..ae22b590dff4 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index f78f09bb3579..ba27a0e3d01e 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -5,4 +5,4 @@ DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0
 DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
 EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
-MISC metadata.xml 778 BLAKE2B d3291ffd8dacecb55cbb2798c9bf98b8eb361bd0c82e2c440868757604edb98145ed04c3446ca92e9b18564a1a53f7b0fbbb94cf51adcf19ebcb9162086690f1 SHA512 49f78f732de99b82fad3f3ec6915d15f2050d9f6f1382a74221aa5608efc76b8e5e908d0f51a276afb8b28bec9d8291454695b3cd70314ad8836f444a03b2735
+MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 8d9bc56c585d..3005ddb12475 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
 		</flag>
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 2dd3fad92cbb..2af6851b1ec2 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,9 +1,7 @@
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
-DIST ethtool-5.1.tar.xz 237580 BLAKE2B 74657b44558548ef3dc2ca960cdf760bf1ce28741b1bc1c7684c5bb5a25b6cd90a0458201fb03ca848fa622c91594cbfe982179344316ec9a51a1d5567cef43b SHA512 291317ebf604138ae0c745ca73372388e3c9612fa7ae8522353e81593eed9b0e024fed1ba98f7b48bbc12e763eae9e8d845b67d102c0441c38a6ea36ed9f723d
-DIST ethtool-5.2.tar.xz 237700 BLAKE2B df7cfd9deaa8000352138e9747fe3811fddab2f5865a02dd27a1c476d21333e5b8bb759f7fb397bd48f0fdf5ee513b6ffaf01cc6f3f1d3362abe9f5a708b5a0f SHA512 6b59923d67727895748438d6fb02542dad108aa30fa1ae684af6b6493dbf5eb63fe56fa3fada062c8c7d78efa3dc3c574f874fa13efd81262b59725b193aa2c8
 DIST ethtool-5.3.tar.xz 237952 BLAKE2B fc8e1f1219c967d52ba19ea6c8baa0f18e1d9045a9f0b72f5991328e523dcbdcb6fa6f6c601b7637bcd268c374389d8a6ef65d7034abf68ecf83e73c2ec7149f SHA512 ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0
+DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 EBUILD ethtool-4.19.ebuild 459 BLAKE2B d0bc1b7cf0ef19c205005e29c5d35507e19ca66137e5ccdb2da963ab89aa7a28bdf9ee2c8e6854bd112c1128b1c10826c48147d3709966be785bb45f501b4307 SHA512 b7a04a62ea10b59a1a11e14204344a7d8c7ec49ccfc0e149898bb2a237cf4f86055cc794b515e1a6c7b277c0e39533050ec00e8c990fa9ae0b56bf1995e6028f
-EBUILD ethtool-5.1.ebuild 469 BLAKE2B 61babc043d3d2d2090d0c2fc8a84983ffc575eb1ac48e52c820df0427d738344513b5e288997282c5da3d1938ab3cb6339920a451955731053d51768aad9a736 SHA512 02084259644ff34357677a8410778db88bbd44ff82f3a514b4cde30c41593251399df7fc9e8c84b2df766b47708a24b98421273d1f6c817d019c9527015bac44
-EBUILD ethtool-5.2.ebuild 469 BLAKE2B 61babc043d3d2d2090d0c2fc8a84983ffc575eb1ac48e52c820df0427d738344513b5e288997282c5da3d1938ab3cb6339920a451955731053d51768aad9a736 SHA512 02084259644ff34357677a8410778db88bbd44ff82f3a514b4cde30c41593251399df7fc9e8c84b2df766b47708a24b98421273d1f6c817d019c9527015bac44
 EBUILD ethtool-5.3.ebuild 469 BLAKE2B 61babc043d3d2d2090d0c2fc8a84983ffc575eb1ac48e52c820df0427d738344513b5e288997282c5da3d1938ab3cb6339920a451955731053d51768aad9a736 SHA512 02084259644ff34357677a8410778db88bbd44ff82f3a514b4cde30c41593251399df7fc9e8c84b2df766b47708a24b98421273d1f6c817d019c9527015bac44
+EBUILD ethtool-5.4.ebuild 469 BLAKE2B 8ca106ff0e0d753670fce61f09d9378b239c590bb95f5f20d087b2da6a40628898f5df455eaca9765ab1459bab5234fdaa5bb79799e876dc8796c9e4e2afb686 SHA512 92f13ef570ad9f7eea9b5e01f16e207cf07aa9e38830c5b93517fb89d3b37c469860f03530fab8fcd15957e31ed10cf458d8da0485d43057ad03254b6abc0f95
 MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
diff --git a/sys-apps/ethtool/ethtool-5.1.ebuild b/sys-apps/ethtool/ethtool-5.1.ebuild
deleted file mode 100644
index 7a20a1bbc622..000000000000
--- a/sys-apps/ethtool/ethtool-5.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-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 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.2.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index 7a20a1bbc622..ae3e22f3417f 100644
--- a/sys-apps/ethtool/ethtool-5.2.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 055fe05dfcdf..a90ea843ddd1 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -117,5 +117,5 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 DIST zoneinfo_compiled-0.4.5.crate 7260 BLAKE2B fe461bb585de1a606e8fe800b4df763a988be643a1499e6d4ec182cdd43ea0721ebbea30ed70da4b79fedb2376d2328c4a2bfff993a13046427f85465ad73225 SHA512 1b4248c68d12e2edab047e6067876e5d662b9dc5cf9bab33188082cee0b7aff6162d6288dcad4b08da85baeccbb0f8df81e426448aeda7027544518e3e7850dc
 DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 EBUILD exa-0.8.0-r1.ebuild 1864 BLAKE2B 2b6dcc1c91530a53b955b886c61698d5eee82382a5c253e1060bf25c526eb06f486844b495a3d984b33e06f2b8b004b2994829af1c746a1c43cd6d1a98299347 SHA512 6b9355716b1778fb9d0f437ed8b06049c98e0b796225f705d1a221488e806005fc2e7f76895adc5d6d3aebcde0c859a2c44c107e66dd87ea9621bf81370cb263
-EBUILD exa-0.9.0.ebuild 1944 BLAKE2B 3993ab3dbe8906a91d924402ef37b0fefc180cf633b6c9d4aaaf1774104b8f8a9b24cc33f8c7a5dbafb30b3db1c02586e2866ffe568f2b5aef12bc173f8aa98f SHA512 64ed16037fa0b891190f7b80d236265758c932893c2e2caf8014adfefc3f263efb521f2fdad0790fdafd143d5cea34d0a3e1d51aead82b87bb84c00c417f69c2
+EBUILD exa-0.9.0.ebuild 1941 BLAKE2B 07606aa20a557ac7bfb7b2c17f1887add9248eda9e1d8d7200d15fecc7f8b184cd0e7c2b778bb03b6ae0ad46fb761abc7fc44db61aa1890c86c577d26702b90e SHA512 ce0fa5ee151c4b6de7a8f9465b87d97f49562ffc6252142a1eb446e5abe3cab522bf2fb6cbcb1e5fd5044a968ce6bb9cbff1cb8c31eb664d6553a0db1db6d937
 MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/exa-0.9.0.ebuild b/sys-apps/exa/exa-0.9.0.ebuild
index 633657fe1c84..09ded01303f1 100644
--- a/sys-apps/exa/exa-0.9.0.ebuild
+++ b/sys-apps/exa/exa-0.9.0.ebuild
@@ -78,7 +78,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+git"
 
 DEPEND="
@@ -99,7 +99,7 @@ src_compile() {
 }
 
 src_install() {
-	cargo_src_install --path=./ $(usex git "" --no-default-features)
+	cargo_src_install $(usex git "" --no-default-features)
 
 	newbashcomp contrib/completions.bash exa
 
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 94b3f37dd639..be042ea0841e 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,60 +1,99 @@
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 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 atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST cc-1.0.29.crate 42386 BLAKE2B 6145e3c18f4db24bb0f8b2bb8903c30623c5c63fc596375ef531fd5832ab5e22e896517022b5927dab756a72a69e33094543c665d6bc768d285307ec3f1fdba0 SHA512 8cfdbe735b547bbcb125ccfa54b4aa5273e8f952345713d42375376a388833bed791d1f28520821faa6586ec4c484ea210f19edafcd8a8c65793aa2fc3cd0756
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
+DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
 DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST ctrlc-3.1.1.crate 12110 BLAKE2B d6dcf6c132d64e5450c834c1e5c032f33be6fbcf2265c727b4541feb92a1d8df31b6c67e667e920a406f26604971e1715946e40d201a90b84d8d9258169443ac SHA512 31e7208a6e6d2b8ff2e00dd9e12cdba3ba9eac24418cd3df137648698bb9489f4bf0b7cb8b28bacf3300c44a6001b4c4fe7f87fc11d3d47e2f0cca7f8b0d70fd
+DIST ctrlc-3.1.3.crate 11792 BLAKE2B eada522e42753c751bae996f2e6af5cf9fd685c1e724c8c111ed7e74117be8e4053cd678c25a735578adc309d0a87cbc6e9d175406b8225d8c2edd2d4c7ce229 SHA512 b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8
 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
 DIST fd-7.3.0.tar.gz 57694 BLAKE2B 2f5fc19117fe0a8a611a8ea2fa1b96e6c9677a5049706908f42132b6f2a1090b92dd080c518a266bdcd17ffc4301282ab073c2d7126459ed4b3ea7c75587d6fa SHA512 48a7a9b41463070d26c76018909c527c4a33efd6b6c7e68184ff1e477bb87483ce7ed49c214893a01de0c57579026fe0616b989d169eed001529d377028371d5
+DIST fd-7.4.0.tar.gz 60366 BLAKE2B 70cfaea591ed7d58ab068fba1cba20432e70d52ddab9b0dcc48570452b97abaa9881074312114483b2280ef0fdec8f4e9ec170cf48ffc7dc2986a68bc68ca80e SHA512 abe42ffedc8bb4ac5ddff9ccfe0d38dc70604ab0184b6e300a3800735d82d25f48b7b01d3cf94a5b661810d66f706517549dcb636b01fd41cf6d8b5b31eaef31
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
+DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+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 globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
+DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
 DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
+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
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
+DIST lscolors-0.6.0.crate 17577 BLAKE2B 163fbb3b212af633d73a3ff73808ef13cb687e66afff5d3a15cef992ce6c4af8960baf826abfd098ce1a2d4fdb90178b780dd81404859be2ce748027f6a5448a SHA512 245e5d9fca5355d7135d089f9b1f66e4863b38829f52625366c6bf6eb7f1837d7b57ca30967843e2a6219b602618bd2048ab2a31912110083d177b7939f39e81
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
+DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
+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.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+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 termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+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.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
+DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fd-7.3.0-r1.ebuild 1859 BLAKE2B 7b9379b8a3ba9a2739537023c43de16e091ddbb88ff8a67598567f2e939238b912ee753913659ea23b92041abee94bb79767d6dc9079e965e4d8bb744c6eb9e5 SHA512 a4be4c35308124d4642050dfae39e8b34d7ad58f86ba6fcf68f3b18beb8bd7dca8bac220875dbf221611af9b452be926eeb6b6d5680d323fb6f866f699b79c96
+EBUILD fd-7.3.0-r1.ebuild 1850 BLAKE2B 1e2e2cb86cf804b1e65610c094d05639bf3b576c73ee15ad4f4b151f967246456fc81541aea849e3a0dcc8482579832beb847fbf43cf571054d7fec3cd287718 SHA512 02b0e1090e7068f5f0f4abb7076db5629ba069567e377cea4d49019b0a1616a43c7b4a9b8915a0f15b70f9aefeefb30601636ae4d20daeec48061bc29863aae6
+EBUILD fd-7.4.0.ebuild 2057 BLAKE2B 35c301018beb69a257f81d67e0e5dee36d8ed0642b934e1c75c4dcd60a07f9fb2bee415e091d7409075e311734677ec69b7ae7b9615f3fd658fd643ece6c4479 SHA512 86d956794764a0d7bf363ff7b4db03a0971855f8eb6835ae0b6129825055d6f5f19cdbda0199cfeb5e8e6342c0d56e964e077fb4f94a347953e11ba270502af7
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-7.3.0-r1.ebuild b/sys-apps/fd/fd-7.3.0-r1.ebuild
index 3afbc07ff760..66ffd10fadf6 100644
--- a/sys-apps/fd/fd-7.3.0-r1.ebuild
+++ b/sys-apps/fd/fd-7.3.0-r1.ebuild
@@ -86,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 
 	newbashcomp "${T}"/shell_completions/fd.bash fd
 	insinto /usr/share/zsh/site-functions
diff --git a/sys-apps/fd/fd-7.4.0.ebuild b/sys-apps/fd/fd-7.4.0.ebuild
new file mode 100644
index 000000000000..a3416f336c6a
--- /dev/null
+++ b/sys-apps/fd/fd-7.4.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.7.6
+ansi_term-0.11.0
+ansi_term-0.12.1
+atty-0.2.13
+bitflags-1.1.0
+bstr-0.2.8
+cc-1.0.45
+cfg-if-0.1.9
+clap-2.33.0
+crossbeam-channel-0.3.9
+crossbeam-utils-0.6.6
+ctrlc-3.1.3
+diff-0.1.11
+filetime-0.2.7
+fnv-1.0.6
+fs_extra-1.1.0
+fuchsia-cprng-0.1.1
+globset-0.4.4
+humantime-1.3.0
+ignore-0.4.10
+jemalloc-sys-0.3.2
+jemallocator-0.3.2
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.4.8
+lscolors-0.6.0
+memchr-2.2.1
+nix-0.14.1
+num_cpus-1.10.1
+quick-error-1.2.2
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+same-file-1.0.5
+strsim-0.8.0
+tempdir-0.3.7
+term_size-0.3.1
+textwrap-0.11.0
+thread_local-0.3.6
+unicode-width-0.1.6
+vec_map-0.8.1
+version_check-0.9.1
+void-1.0.2
+walkdir-2.2.9
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+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 7f0e43cf1fb6..2e14ecb417c0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,7 +1,9 @@
 AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f574aac769c7728bada7b622fd670616efc12d42cabf95b32a8a98c811e171059af2e127c170c1935dc00def4a1fc05b6 SHA512 3517e35db03944bcca6da28ddac9f0d08ce052b03d1508d26851fd6691bedc89f3974822a1559576987c8c10a0343bc8788cc7df52406d66a591ddcd39b23a5c
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
-EBUILD file-5.36.ebuild 3140 BLAKE2B 5dd07458582785009964253e23e2e52f1abf1ca163aea5b4c4a504fcc5d85443a3a865edfeeebb29b5be6c02db00eb010d91be1777072fc2f7b4713b95decea0 SHA512 261875b1a18aedea7ca70e54fdadb974ed40d8ef42852fa1b9f88860402fa7fa1ad27d36f52adf6390205aecab16b58d8c0464f1dcbbfb051a451bdbd32e6788
-EBUILD file-5.37-r1.ebuild 3205 BLAKE2B 65dadc39b86aa179867f6a97c84063336711d7ae9c95f83958603b0bf7dd0d0f66045dca3af430280e58fa802720491e34c540d7dca17c23866bb629b4602823 SHA512 2400a93f6ce6a35745c3eb0abcb7b27b55a64875a0b1d8a00602ec728fc82355ca585225c7bac79428bfb0d1e52bae464f28aa575435936a0407426c35909088
-EBUILD file-9999.ebuild 3242 BLAKE2B fa3bf513d110c9cd68a7c42c5456d16a1fb0fd1020c6e13baf149790760a288c759c918e2125e9009ee097b4de08708fb27968f61ef71ea26226566db7efc39f SHA512 a858823a85f8673a034fc2ed39a05b82246af8d92b7550f0f7ce02a2f59b7b3361a1c7941c07ceab56dd76d27174b49927a1ddefbb9b503f594302a0062e9bf3
+DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
+EBUILD file-5.36.ebuild 3133 BLAKE2B 064e1ec5045f73d11296aeea780c156554a3e619fec29ee903ef01ddb653c11341b0f1ea357dad132c26133b624f0665099d5f5b9fa3cb1c127f87c57b463616 SHA512 12785c61dee0ebe7cce21b63aaa1f37b7f5abbb0fa2c13bd5e147a15cb52f2b187299e1ab7c9a743d76026e8ea8e322c98be3822e4879d026dc3b8f8a22fdf2e
+EBUILD file-5.37-r1.ebuild 3198 BLAKE2B 243049377387cb571b07cd596b4a0aca152663f926f9810a8c7f2cded363a9a4e23b42af8f7e1b466491def2ac2f49af36619e8d3b712120aeba510781e28120 SHA512 5dd3430b1a7e7521dd6e20f5c4f9325fe1287bf22c6c0bd2f93ec1e15f2917539b7303a01f563b1a1946ffdb8a354e3635d1ea4fbb6c403a9b6d298a53e31396
+EBUILD file-5.38.ebuild 3181 BLAKE2B ff3210e7613373ef2c6724afadee0c719f1e0a12fc4b95627f504f829eddda0e74fe8c7468cbba651ce977158672e5b44582f897041458963cf8bcfccc6f8f36 SHA512 e6e00a2a98cc6a5a09aafe7f16d02bd3f37035c6469493074c0072abd0de0e65f11d66a5a1312493a35ba838a5d893978a8502bc3344eaa9b6638f5342ad2631
+EBUILD file-9999.ebuild 3255 BLAKE2B a122a89172ec84d405f851dc868a46fe015ecdfeb4769bdad8336df94c13d28b81ed19707380a52caa3557ce4b89ef63d211db1056a21caa20ddba10bebad059 SHA512 5b439e74d3871f7d955a5c3b162a980f0d702604e2ce94d67eb394c37e2fb0841a302eb4618169cb169f58176a047a7006add53bb22a22c141981cbd5f3274da
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
index 98737a73d9bc..db74851118d7 100644
--- a/sys-apps/file/file-5.36.ebuild
+++ b/sys-apps/file/file-5.36.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index f5cef9e2990c..7f28f9ddac89 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-5.38.ebuild b/sys-apps/file/file-5.38.ebuild
new file mode 100644
index 000000000000..ed9e8dbc5bbb
--- /dev/null
+++ b/sys-apps/file/file-5.38.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index ed9dd421c39f..18f5920b53c1 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
@@ -21,10 +21,12 @@ HOMEPAGE="https://www.darwinsys.com/file/"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="python seccomp static-libs zlib"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
@@ -48,32 +50,40 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
 		$(use_enable seccomp libseccomp)
 		$(use_enable static-libs static)
 		$(use_enable zlib)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-src_configure() {
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
 	# when cross-compiling, we need to build up our own file
 	# because people often don't keep matching host/target
 	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
 		mkdir -p "${WORKDIR}"/build || die
 		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE="${S}" \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared $(use_enable seccomp libseccomp)
+		build_src_configure
 	fi
 
 	multilib-minimal_src_configure
@@ -90,10 +100,10 @@ multilib_src_compile() {
 }
 
 src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+	if need_build_file; then
 		emake -C "${WORKDIR}"/build/src magic.h #586444
 		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
 	fi
 	multilib-minimal_src_compile
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 2ae547500387..9078e654c398 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718ac
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.6.0-r1.ebuild 1966 BLAKE2B 5f6d8fb48ee5e5741f1adec247408677682e1dc17727b2497b5ff5514f627f53811d25f37a0153fa95f077a6f9e61b83d621ce6973ca98fd693203df23ec3f0b SHA512 2d3993f24b9cf8d1d5c6f54a22bdc5ccf1676cbb22de20a019a493dca5eb251852fd5d4166372771d3eff9176b0bfbe1ed7428c3f538f850a0cd1bf4ff4e9c96
-EBUILD findutils-4.7.0.ebuild 1697 BLAKE2B 49d6c07cc7c46ae890b02024b3da3988eb8799c76424b70e4fad9439fb5b7f96e37f02379d2389670b4e9d032e1b67fd8f29f3dd06815a339f659db65fefc4c3 SHA512 d9da17baff77076fa00f9756fd863c8e4828810d405a430dafc0a6b9ac23294d369c17767d0381536db05a0b4bc2aec69353dbbced5779d7126ab732cbf36aa1
+EBUILD findutils-4.6.0-r1.ebuild 1962 BLAKE2B 5cc16678e7fe7022087f355ef664b022165168673c81428a77770eb345a042652a0f8e3f01ec57b35361494ebd29860ef9166a9819ee2f55d59547fa88d305b0 SHA512 3cab645199b2afd117f3903f2da21805bd3f472e82c6fa9e4beb908fb37c1864c3e6d83c4a894823f43de881758eedbe3de943a317facdf9bc7e1e2f4137b192
+EBUILD findutils-4.7.0.ebuild 1695 BLAKE2B 09cf65bd88bdfd092ef4c43569c875ab71493169127238b751e838ce9d3d6ab930b16819f575a99c18b44269ec549ad8d07585efe1ab691f59fda6e2a0d5524a SHA512 c4411d4c4280f1e4343acc0737a0a60c0cdb85cf0ce429e4c43e69b7cbaa7fbd5cc24d44bb3967bddfb135200e0ed47044336c8b548e51bce76755abea7af904
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index b6d494b7d91d..2b7a1252637a 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit eutils flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index e42dba38fb07..fca1640b4202 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 74531eb9d473..036b696cc14b 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,6 +1,8 @@
 AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
+DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
 EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977
-EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3
+EBUILD firejail-0.9.62.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
+EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
 MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
diff --git a/sys-apps/firejail/firejail-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild
new file mode 100644
index 000000000000..8dfef8571888
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.62.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11"
+
+DEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	test? ( dev-tcltk/expect )"
+
+RDEPEND="apparmor? ( sys-libs/libapparmor )"
+
+# TODO: enable tests
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die
+
+	find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
+			--expression='/^\tinstall .*COPYING /d' \
+			--expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
+
+	sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die
+	sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die
+	sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable contrib contrib-install) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable overlayfs) \
+		$(use_enable private-home) \
+		$(use_enable seccomp) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable x11)
+}
+
+src_install() {
+	default
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins contrib/vim/ftdetect/firejail.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/vim/syntax/firejail.vim
+	fi
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index f47575ac444f..8dfef8571888 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-firetunnel \
 		$(use_enable apparmor) \
 		$(use_enable chroot) \
 		$(use_enable contrib contrib-install) \
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b6c322d9e057..15e1e94cec60 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,8 @@
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
-DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
-DIST fwupd-1.3.4.tar.gz 2151009 BLAKE2B 3ea171d4a9498963b6082ae2e3f9b41edde862b84f3f506e403bc2dd6a08ec27ccbac6c5891bdf567860f43b008ccd36a7e6d40e72f2d252eceb913833372719 SHA512 00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254
 DIST fwupd-1.3.5.tar.gz 2164874 BLAKE2B aa268f3d94b3c7104cad5e80de81a724ba978e3da468cd2d44833656c5b0a95b1f720f5c7a0dd9812b8afce4c58e8f777e13ea2e1f4ce0b8b582ee3c731b744a SHA512 b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd
-EBUILD fwupd-1.2.11.ebuild 3793 BLAKE2B c5a9c015421ac2405f1b366869a01139f28caae2b7e57906e65493e38cafdbda7b170a53d5d49750dda0ede86b3611fd05a0031acef741d6eecc9889c4cf6c11 SHA512 9fb39992086689a325c1f931e1df1737e69689938e62f96e55177c3f582400546531b32fb3ae21e2a35c6f820bc72511d40a37932f9e462d7dbb01928c465d4e
-EBUILD fwupd-1.2.8.ebuild 3683 BLAKE2B 3c1626fe3945a7b838e79ab032fec7ef02fb78b03ddcefcf845f5bc300f4938eeabe2cdc668ff342d3ced5d64f1ef6c1136e05d84e3dac24f7c8df1351cc5b53 SHA512 f81515eb238834dbeb95c8906a8c33e79d2381c455eb07c8593d9e96d223ba5d319b40dc6df55f34cbbbb16d4c29572ea06c4d8b016aff770ae8362938176a0a
-EBUILD fwupd-1.3.4.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0
-EBUILD fwupd-1.3.5.ebuild 3963 BLAKE2B 70c276596e2e3907fb39ae5436878c9a933cfbf1e34ace19ae81a606a3c54b0069250340840c9508551c28df36c1074a9fba605c3f2561c51f8c67f8c0110c4f SHA512 afc01f9ea0b5bea531835bbe21cee21891dfe0ee446c03c022accff50c375967e47e9578b5ab5c7aa85d1fcf88e844501e0493a8d62f65d3299b65a77867099a
-MISC metadata.xml 1333 BLAKE2B 7978d7232cd10e4fd6d19684077dd1ba1a7db10c4869bfffcb7bc6410134da36572bccc21bd00ed29671513f3ea1323bec4dac15fdbb94e22adf523fdcd90fae SHA512 188a5b54787b8b41a0101ec580a59e0edebb94db65c4360bfc3dd108458a8ea80d43873a1109075bdac15beb77034d3a1d4d118a29235da6c74faed5111355f7
+DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
+EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36
+EBUILD fwupd-1.3.5.ebuild 3961 BLAKE2B a5cd38338045f77dc4fdb5da17adc38c9a00ed286dc4d6c6316d3a150e07369c62e06dbe4d0613bc948407ff745feb63b01bca9d22a1dab8902ee1722e2c896e SHA512 860bc62000ad160c7c61a75bedf4ebee7bf5040776f53805dfe30d95a267bdf78fcfa64faa3fc8f97ad4dcc929cec7ec27eba85945c4f9437ad1e030f3184421
+EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c
+MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
index 31f15d07c13a..8bad64accc42 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-single-r1 vala xdg-utils
 
diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
deleted file mode 100644
index a1aaa0b451dd..000000000000
--- a/sys-apps/fwupd/fwupd-1.2.8.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit meson python-single-r1 vala xdg-utils
-
-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 colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind systemd )
-	dell? ( uefi )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/gcab
-	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/libxmlb-0.1.7
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	x11-libs/pango[introspection]
-	nvme? (	>=sys-kernel/linux-headers-4.4 )
-	test? ( net-libs/gnutls[tools] )
-"
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dagent="$(usex agent true false)"
-		-Dconsolekit="$(usex consolekit true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Delogind="$(usex elogind true false)"
-		-Dgpg="$(usex gpg true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dplugin_nvme="$(usex nvme true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	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
-}
-
-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/fwupd/fwupd-1.3.5.ebuild b/sys-apps/fwupd/fwupd-1.3.5.ebuild
index 410035b21944..9b799a5b2c1c 100644
--- a/sys-apps/fwupd/fwupd-1.3.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
diff --git a/sys-apps/fwupd/fwupd-1.3.4.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild
index 684e4c548a49..a0a687b89dc4 100644
--- a/sys-apps/fwupd/fwupd-1.3.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -14,7 +14,7 @@ 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 +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt uefi"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind minimal systemd )
 	dell? ( uefi )
@@ -71,6 +71,7 @@ DEPEND="${PYTHON_DEPS}
 	thunderbolt? (
 		sys-apps/thunderbolt-software-user-space
 	)
+	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		app-crypt/tpm2-tss
 		media-libs/fontconfig
@@ -122,6 +123,7 @@ src_configure() {
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
 		$(meson_use uefi plugin_uefi)
 		# Requires libflashrom which our sys-apps/flashrom
 		# package does not provide
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 1d2ad3564b91..2dedd857c0d5 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="redfish">Install redfish plugin</flag>
     <flag name="synaptics">Install synaptics plugin</flag>
     <flag name="thunderbolt">Install Thunderbolt plugin</flag>
+    <flag name="tpm">Install Trusted Platform Module plugin</flag>
     <flag name="uefi">Enable UEFI support</flag>
   </use>
   <upstream>
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 854e51cefc9a..6a50dee937d9 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,6 +1,4 @@
 AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887ebd72aaca79dfcdc44a602591d3d9ee11047af1655678e6a9f5c2fd445e67cb66b65cc1ac0a244db22b8f9c1d SHA512 1f7ec2af9e2764f338d5d903ce506a8416d21cf03be6c2dc927d3fde67420c5a9066244db0e3837468fa2bea0527643bfb55dc6db8524e8122467d13e19db418
-DIST gnome-disk-utility-3.30.2.tar.xz 1665896 BLAKE2B 9000dc8e95f27cccdb3a13b84c527c740f801a58b0f3f1a384ae1415eeed330f5f81f284f190d110dca0f5dcfb9316262491b715c2b2cd4f67813587046b5b42 SHA512 59228fa923b7b1e89e8ce8d96920b6f452bc6ae62c203261bffbc584a2ef231e1d2006db8ddbd15f1f7b4ee14aeae54b85520b89bfd3e1450d42c423d987f2dc
 DIST gnome-disk-utility-3.32.1.tar.xz 1370900 BLAKE2B 4986169bff7f438b4a9dc9fe10ea69521c41afaa268bfebdf195ff3fedc14e0d8204e66b258c71f599867c0279c781ca5ceb175381dcc8004c41d97be92ebf46 SHA512 80c4e2fb1ca6136579203c3df73da4c8ef7d496ab73166096768d72b3473d11e9ae199d4aa1878c49ec4280ea98d2136e084a03bba50c2728be4c5e4d508967c
-EBUILD gnome-disk-utility-3.30.2-r1.ebuild 1632 BLAKE2B f36dafb6a302d27b8e21a5f63206ef2cdece04c8c1545a55eeabc94bf1654db154db91be27775735d1539abfd7218d9c6d05ac4795ed1cef73995a00282108a7 SHA512 6328bb987abe301bddd1a08230345893a9b48a5092e89db5d1349007fdd7adc9c6d251025f2166a2d55b92f63dade7960d1671bbcb0152ec5482cb6a247263c7
 EBUILD gnome-disk-utility-3.32.1.ebuild 1632 BLAKE2B f36dafb6a302d27b8e21a5f63206ef2cdece04c8c1545a55eeabc94bf1654db154db91be27775735d1539abfd7218d9c6d05ac4795ed1cef73995a00282108a7 SHA512 6328bb987abe301bddd1a08230345893a9b48a5092e89db5d1349007fdd7adc9c6d251025f2166a2d55b92f63dade7960d1671bbcb0152ec5482cb6a247263c7
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild
deleted file mode 100644
index a5810d668f9c..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat elogind gnome systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-2.7.6:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/libpwquality-1.0.0
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=media-libs/libdvdread-4.2.0:0=
-	>=x11-libs/libnotify-0.7:=
-	>=app-arch/xz-utils-5.0.5
-	elogind? ( >=sys-auth/elogind-209 )
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-# appstream-glib for developer_name tag in appdata (gettext-0.19.8.1 own appdata.its file doesn't have it yet)
-# libxml2 for xml-stripblanks in gresource
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/elogind-support.patch # https://gitlab.gnome.org/GNOME/gnome-disk-utility/merge_requests/15
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature elogind libelogind)
-		$(meson_feature systemd libsystemd)
-		$(meson_use gnome gsd_plugin)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 2ca6f0bae4ac..2b8e21cd7bff 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
+DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 EBUILD grep-3.1-r1.ebuild 1460 BLAKE2B b773df4ed27768f62fae2538ae0ed894d3168696bb8aec2dc139a7b6a485fceb09b380344009b6dd3d080a9c1cd967cc8cf2c91965b26af09884d951591f5682 SHA512 ce8e19a2a97dfd0eee7bda1b6ba11f272412fd8b2ab865e82000654e531a993721bfe0e293c1218c8f0df48cb9cb8fdf0c1da92159188bb2fea30dd1f567fff9
-EBUILD grep-3.3-r1.ebuild 1476 BLAKE2B d0a68c23c779268dd8957da570a6a10fb1531280c9d02c111883ce7021fae364e0a6d78036a3f90e924bb481aff12b0a61f708e6e23a4d5e5a87e95ffa6b785c SHA512 e466b7c0afe709318e3be00cd3de06bb5fa4d9c51f61cac70eb07575274857a17c55d7fcd46bbeaf28c9a85f1d1c423b68bd90fa0f4ea5e0504fffb52e3d5a64
+EBUILD grep-3.3-r1.ebuild 1466 BLAKE2B 3d5ec0b7bf29bfbabfc3d666dc0e22668ae9ab935afe8cd06c379b43d03eb6b1bb32456a6937665591ec52bf5dc291c3c46c43edcffefa3fab9200fed48d486d SHA512 fae062a766dac5f974d44058d309668546bfd3db9890674370cce386556620d7857f402ae64f76f47d1e2a738eea551b8228e8f836fb7c53db64930e44842fd6
+EBUILD grep-3.4.ebuild 1526 BLAKE2B 729d08acfe1da73ff627821e2ff50ddb90ccd3828506f7da7937cf3f73677f0b860a6923e731439ec9443e4641f7cfcc99b189ef8c7d8e2832f1598713daf573 SHA512 341197e89816a0a466d92dc078f233cdd2c76b5e998f84ed1b9feac500caf9e9857589c423649f2665e89a7468ab43bcaf31071f50fecaad070b89390adc7db7
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild
index a623fd4f312f..ba46ad9774f0 100644
--- a/sys-apps/grep/grep-3.3-r1.ebuild
+++ b/sys-apps/grep/grep-3.3-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
new file mode 100644
index 000000000000..db80d522f833
--- /dev/null
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls pcre static"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die #523898
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# don't link against libsigsegv even when available
+	export ac_cv_libsigsegv=no
+	# Always use pkg-config to get lib info for pcre.
+	export ac_cv_search_pcre_compile=$(
+		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
+	)
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
deleted file mode 100644
index a9eae9b3a3f5..000000000000
--- a/sys-apps/guix/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX guix-0.16.0-default-daemon.patch 2082 BLAKE2B c60299f9cf2718fb227340acab688206d5453df98b80890e1659d2e477d2a1e9fe1a2d21fb9696ccdb67dd000d094103a38e979de2105023d175cff69a740846 SHA512 69d2089a089bc4718bcdb6f8e5dd17cff8cd07149d8c10182b7cb22d343d8137b368725d7e3d4bc0d380b0eeabe22cae5b3b914ded0cbdac6307bf9d5c898285
-AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
-DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
-DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
-DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
-DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
-DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
-DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
-EBUILD guix-1.0.1-r1.ebuild 4654 BLAKE2B a5359b2c9641e6dca4a781e3e666ffd33bae15b944f94878135b4e730bdda4b881e046460099520d74ec8173fca7437d1d11bd1a96d75dda1f0eb49d8908c08b SHA512 e3b07b2b2d41a2031fd4fc2fa802e590e8b1924c1cedb31da1c914f2f0b7d24be9d2cd7226d6d7ec8f70a6d9275c9f00e736a1dcb569f023e165a27c78c7d7da
-EBUILD guix-1.0.1.ebuild 4561 BLAKE2B e83b2007f66bef0612f6aea68f894645c0856a41312857ceef3d3084e4f684d69d87a37a9f7fa1cf6c49f7b585dfc73fab1240c2a588ba9b60c73021aedbeaa1 SHA512 60c31ddb829937de5995e643be99739267345a5ea4aed91953ca593e3d4ac71bc6674cd41bf9019da2fdd0524af91f6f1b69e7a76a45a1af4bff7a75dc2e5d66
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/files/guix-0.16.0-default-daemon.patch b/sys-apps/guix/files/guix-0.16.0-default-daemon.patch
deleted file mode 100644
index cc2b56e09131..000000000000
--- a/sys-apps/guix/files/guix-0.16.0-default-daemon.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Don't require user to create profile manually even before guix-daemon runs.
-
-Default install should provide working basic environment.
-
-Revert "build: Don't embed absolute paths in .service and .conf service files."
-This reverts commit 613d0895b92c677e0639d5e77c55043e38e020c8.
---- a/etc/guix-daemon.conf.in
-+++ b/etc/guix-daemon.conf.in
-@@ -9,1 +9,1 @@ stop on runlevel [016]
--exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild
-+exec @bindir@/guix-daemon --build-users-group=guixbuild
---- a/etc/guix-daemon.service.in
-+++ b/etc/guix-daemon.service.in
-@@ -6,1 +6,1 @@
--ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild
-+ExecStart=@bindir@/guix-daemon --build-users-group=guixbuild
---- a/etc/guix-publish.conf.in
-+++ b/etc/guix-publish.conf.in
-@@ -9,1 +9,1 @@ stop on runlevel [016]
--exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181
-+exec @bindir@/guix publish --user=nobody --port=8181
---- a/etc/guix-publish.service.in
-+++ b/etc/guix-publish.service.in
-@@ -6,1 +6,1 @@
--ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181
-+ExecStart=@bindir@/guix publish --user=nobody --port=8181
---- a/nix/local.mk
-+++ b/nix/local.mk
-@@ -190,7 +190,7 @@ nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
- etc/guix-%.service: etc/guix-%.service.in	\
- 			 $(top_builddir)/config.status
- 	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`";	\
--	$(SED) -e 's|@''localstatedir''@|$(localstatedir)|' <	\
-+	$(SED) -e 's|@''bindir''@|$(bindir)|' <	\
- 	       "$<" > "$@.tmp";		\
- 	mv "$@.tmp" "$@"
- 
-@@ -201,7 +201,7 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf
- etc/guix-%.conf: etc/guix-%.conf.in	\
- 			 $(top_builddir)/config.status
- 	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`";	\
--	$(SED) -e 's|@''localstatedir''@|$(localstatedir)|' <	\
-+	$(SED) -e 's|@''bindir''@|$(bindir)|' <	\
- 	       "$<" > "$@.tmp";		\
- 	mv "$@.tmp" "$@"
- 
diff --git a/sys-apps/guix/files/guix-daemon.initd b/sys-apps/guix/files/guix-daemon.initd
deleted file mode 100644
index f819fb20c37e..000000000000
--- a/sys-apps/guix/files/guix-daemon.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/guix-daemon -- --build-users-group=guixbuild
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --exec /usr/bin/guix-daemon
-	eend ${?}
-}
diff --git a/sys-apps/guix/guix-1.0.1-r1.ebuild b/sys-apps/guix/guix-1.0.1-r1.ebuild
deleted file mode 100644
index 0ab61861e615..000000000000
--- a/sys-apps/guix/guix-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
-	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
-	"armhf-linux    20150101 guile-2.0.11.tar.xz"
-	"i686-linux     20131110 guile-2.0.9.tar.xz"
-	"mips64el-linux 20131110 guile-2.0.9.tar.xz"
-	"x86_64-linux   20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
-	local system_date_guilep uri
-	for system_date_guilep in "${BOOT_GUILE[@]}"; do
-		# $1              $2       $3
-		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
-		set -- ${system_date_guilep}
-		uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
-		# ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
-		echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
-	done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
-	local system_date_guilep
-	for system_date_guilep in "${BOOT_GUILE[@]}"; do
-		# $1              $2       $3
-		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
-		set -- ${system_date_guilep}
-		cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
-	done
-}
-
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	$(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	>=dev-scheme/guile-2.2:=[regex,networking,threads]
-	dev-scheme/bytestructures
-	dev-scheme/guile-gcrypt
-	>=dev-scheme/guile-git-0.2.0
-	dev-scheme/guile-json
-	dev-scheme/guile-sqlite3
-	net-libs/gnutls[guile]
-	sys-libs/zlib
-	app-arch/bzip2
-	dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
-	# guix archive --authorize < /usr/share/guix/ci.guix.info.pub
-[as root] enable guix-daemon service:
-	[systemd] # systemctl enable guix-daemon
-	[openrc]  # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
-	\$ guix package -i hello
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
-	guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_pretend() {
-	# USER_NS is used to run builders in a default setting in linux
-	# and for 'guix environment --container'.
-	local CONFIG_CHECK="~USER_NS"
-	check_extra_config
-}
-
-pkg_setup() {
-	enewgroup guixbuild
-	for i in {1..10}; do
-		# we list 'guixbuild' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		# 'kvm' is used to make 'guix system vm <system.scm>'
-		# work by default: bug #699642
-		enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild,kvm
-	done
-}
-
-src_prepare() {
-	copy_boot_guile_binaries
-
-	default
-	# build system is very eager to run automake itself: bug #625166
-	eautoreconf
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
-	# is newer than
-	#     guix/modules.scm
-	# In case it is instead of using 'guix/modules.scm' guile
-	# loads system one (from potentially older version of guix).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
-	sed -i nix/local.mk \
-		-e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
-}
-
-src_configure() {
-	# to be compatible with guix from /gnu/store
-	econf \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	# guile occasionally fails with 'bad address'
-	emake -j1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	keepdir                /etc/guix
-	# TODO: will need a tweak for prefix
-	keepdir                /gnu/store
-	fowners root:guixbuild /gnu/store
-	fperms 1775            /gnu/store
-
-	keepdir                /var/guix/profiles/per-user
-	fperms 1777            /var/guix/profiles/per-user
-
-	newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
deleted file mode 100644
index 309d371d09c3..000000000000
--- a/sys-apps/guix/guix-1.0.1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
-	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
-	"armhf-linux    20150101 guile-2.0.11.tar.xz"
-	"i686-linux     20131110 guile-2.0.9.tar.xz"
-	"mips64el-linux 20131110 guile-2.0.9.tar.xz"
-	"x86_64-linux   20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
-	local system_date_guilep uri
-	for system_date_guilep in "${BOOT_GUILE[@]}"; do
-		# $1              $2       $3
-		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
-		set -- ${system_date_guilep}
-		uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
-		# ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
-		echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
-	done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
-	local system_date_guilep
-	for system_date_guilep in "${BOOT_GUILE[@]}"; do
-		# $1              $2       $3
-		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
-		set -- ${system_date_guilep}
-		cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
-	done
-}
-
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	$(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	>=dev-scheme/guile-2.2:=[regex,networking,threads]
-	dev-scheme/bytestructures
-	dev-scheme/guile-gcrypt
-	>=dev-scheme/guile-git-0.2.0
-	dev-scheme/guile-json
-	dev-scheme/guile-sqlite3
-	net-libs/gnutls[guile]
-	sys-libs/zlib
-	app-arch/bzip2
-	dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
-	# guix archive --authorize < /usr/share/guix/ci.guix.info.pub
-[as root] enable guix-daemon service:
-	[systemd] # systemctl enable guix-daemon
-	[openrc]  # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
-	\$ guix package -i hello
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
-	guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_pretend() {
-	# USER_NS is used to run builders in a default setting in linux
-	# and for 'guix environment --container'.
-	local CONFIG_CHECK="~USER_NS"
-	check_extra_config
-}
-
-pkg_setup() {
-	enewgroup guixbuild
-	for i in {1..10}; do
-		# we list 'guixbuild' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
-	done
-}
-
-src_prepare() {
-	copy_boot_guile_binaries
-
-	default
-	# build system is very eager to run automake itself: bug #625166
-	eautoreconf
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
-	# is newer than
-	#     guix/modules.scm
-	# In case it is instead of using 'guix/modules.scm' guile
-	# loads system one (from potentially older version of guix).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
-	sed -i nix/local.mk \
-		-e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
-}
-
-src_configure() {
-	# to be compatible with guix from /gnu/store
-	econf \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	# guile occasionally fails with 'bad address'
-	emake -j1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	keepdir                /etc/guix
-	# TODO: will need a tweak for prefix
-	keepdir                /gnu/store
-	fowners root:guixbuild /gnu/store
-	fperms 1775            /gnu/store
-
-	keepdir                /var/guix/profiles/per-user
-	fperms 1777            /var/guix/profiles/per-user
-
-	newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 8719ec4fd81f..5fb0a28c3c80 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -8,5 +8,5 @@ DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
-EBUILD haveged-1.9.8c.ebuild 1003 BLAKE2B 610931f67cb089bfdb9b8fad276f98278f33506465177e699e8e29c306d265e89519c3ea4719068ead744047da5ab3164abb5552f99390d24102ead9cff6038d SHA512 c0da839f56f2ac86cc919233960be6afab5a4bf09dc270596376a3fffafd53c7e9af718fe7c0e4e7ee6be156bc97c9c28d76ec23ecc827c986caf6ce889526a6
+EBUILD haveged-1.9.8c.ebuild 1010 BLAKE2B 2ffc22aeef509ffcbebccb1d25b81a630e626661b1b8a5f6cf3c802877ce7f352c154e5d2fb2d38dbb9885d49b60a86e251299f56a995b920e3f3d16fd9cec5a SHA512 ebdc6f7c007b3fd51de97a98da0c97ecdcd176dc6625dc201f372ee44745c68f569821c5e526998e05eded82cadf55a8b55443ccad268cfce07b2fee6db57f62
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild
index dfe030e05698..b9926925e523 100644
--- a/sys-apps/haveged/haveged-1.9.8c.ebuild
+++ b/sys-apps/haveged/haveged-1.9.8c.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index ae599640e19a..d5d0bb11e9a7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,6 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
+DIST help2man-1.47.12.tar.xz 202252 BLAKE2B 6a474d62999b2fe6750a0ec7662b9b33546d82ce72edd628f41008243cd3467cad783516d5ad06edb37f471a2aaefd837bd9957a7fd10b6e3c3b6dd33398b79b SHA512 fb71e48e4a7a0f4316148295ea539b667a131149f4467da0f3e283389c9d9f2a5f1e9124ca8d64d6c3250d332a713d4e8de204ca9e7088840e74f316fa5221be
 EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B a6ceb661ac913b1618a330ef9374c5958d8983636b4ecd03ddbfb568560036cf2ea4992365449ad6e85ae7348c4c8d215b5f1c116f26916ce5c58d672a5ef7fa SHA512 8dddb99adc31099404308d1816a614a8531b52835e2237e516bee07b419422b54736591cc7012d03c1f1400e8c6903024900df8d1fc4635bf14e0f6cff99dbbd
 EBUILD help2man-1.47.11.ebuild 1078 BLAKE2B 89dad80b2687605be2a944d77d03df3b041a1f5f01d75d6d66352a80fe83142e19e1b1474ac2ee7228d4eb7842310b1dee871c2768c4319c8a73dca3988582a5 SHA512 d5688282e2994c9eeecb6bb54f03193c85f4b7e550bc62ff1ada161c5cf4363d631459d000133a3eb517652e5d01b3d391b912da7d14b9014a1e2b3299efc047
+EBUILD help2man-1.47.12.ebuild 1078 BLAKE2B 8bf114bf8ef0f3bc986482328918d9488d9d7d7ebecdddc01c2bc51dbcfe87d1e7890b28629d1ffa31908ea96ad26b134fe73ef14d5179f6ef8ae2fcaf29d8b5 SHA512 841b57cdd2ce1de39dea017bc911fa6cacb624155c2696c20c7d983d80304fa3e68a89fa00577652e97f37923a6f124dc11b2dcbcc879ae1c7873bcdd54f2c3d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.12.ebuild b/sys-apps/help2man/help2man-1.47.12.ebuild
new file mode 100644
index 000000000000..a2e138b9d74e
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index d93c22fdeddf..2585adf2cdb8 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,8 @@
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
 DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
 DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
-EBUILD hwids-20190316.ebuild 1712 BLAKE2B 9fbc8b26eb0e11df3397863d80798284a67f263fba66575a34b27368c914ad14037ab8580d436f76900d635e53a05dbe566447971ea250d9bc6d25fa4c80be0f SHA512 2a984901b8ee9bf2a1ac5d2d1fd37ed76e7362c07736fe882ec29e474c6a6736871a91b1908a0f4d6cd04a72d06f06fd811f69e889ca0eaaf1200d8fd4e0a159
-EBUILD hwids-20190818.ebuild 1687 BLAKE2B e2401b36e40f0a7358ccbcf33d7ee501e0fad00162915195f8432611b61af4d48d737effcfa3c94319747de453cc92c6a6218140afbeec6604f185fcd06f8d31 SHA512 872df00684890ea1e19141e9981b0400c90a0c3c3950d7bb5d422d10f44b6f8c2eee6d16f24ea6be6a42b9dfe7c88034e2fd663b11afe6f0dabe8a7174e2667d
-EBUILD hwids-20191025.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
-EBUILD hwids-99999999.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
+EBUILD hwids-20190316.ebuild 1752 BLAKE2B d94d883b379cabbdf03e93035fe07515d965dfb006fb0ea3a7d81655d2acb929de505bad235faf05aa28caa4428cc0dd1fe64086edcbfad8d310615c894fc142 SHA512 8351e894631c093f4b7d745c1ecce0d50b88e19445aa5b97c6e6f8ce5650b1c8dcdf85b274c4874658123ec0966c1269a161909cf78a671cebd2d860a6c273af
+EBUILD hwids-20190818.ebuild 1727 BLAKE2B 4b49f53f54d14a411c4efc949a1fea0a14cf505db9b2050e2edb06b797bcb39c2caa29edda47e1b1f84e8b557c2d835560c73e45abfd2181adb7c72c0c0e83b0 SHA512 b550b872f235848704e995d9d4dafaa2ed3ac6a4f1243222bc3847cca6678b74fa8b68192ffd18323d7aad538213520ded45dc3ec695e7934bb098603792fc26
+EBUILD hwids-20191025.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
+EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index 083d801e08cd..61cefea68916 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == "99999999" ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index 62fd46e5bbb1..0cd5e37d5255 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == 99999999 ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/sys-apps/hwids/hwids-20191025.ebuild b/sys-apps/hwids/hwids-20191025.ebuild
index 81079882934b..c84ff0bd35df 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20191025.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == 99999999 ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 81079882934b..c84ff0bd35df 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == 99999999 ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index c6549aef8229..f538ab86a8f3 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1435 BLAKE2B f59c1de2694a342df01955fa3ffa2f71a96df1f86b09326e500b260dbc3ba82bdac1326c0863694abf2d19529587e77bc6fd1137fafd8b00434b70e1aa7d006d SHA512 b0986e3b0a27a3e1077a15f9557090e06ddf49b968677a33f04de83644b3043bc01e20b90e9be4c89d6646c9f469a971c38d4532d5136c0429836c558a78d4e5
-EBUILD i2c-tools-4.1-r1.ebuild 1965 BLAKE2B 2237523b6353de1af38567826b84b31f5d501d1404e95938b67c62459df2e9b1ca1b475c732315f4fb2f5468bebb1b9e6c379c577cd24267cd5481f0ca2a08f8 SHA512 d208241b151aaabe45160508855e11a639c58f151f36d61479ae5903728c423711f3cef557dc7413585be23fc9e5566239affa4a2d30307ceeaf99907696b4af
+EBUILD i2c-tools-4.0.ebuild 1431 BLAKE2B 2941349de4b1dd25b013caf10c3efb50d203dfad0e1a50fb9b89e3f4ca1abff66756899b01b3854032b11b124fc25b3452765db15f69f81a0f72dc533c0cfa0f SHA512 a119661da2ebd05705379383fee7d244553cd7418e0ff8ba3ca2c0af835ad4cca17c30d75f1e6e352a268a7a3cd828a6eb81f115e8eff48c243f71867624c471
+EBUILD i2c-tools-4.1-r1.ebuild 1961 BLAKE2B 24bf507d14882ca19406f5a9acafb279bda7e2b827de0bef110d0c7eb1c8427889d0cf572c7922d62665b47a2d1fd1aacd6c2355a4fe9740d34025b773bf4232 SHA512 1da4cd03711ac65ba854acae580103d28c68df933474061b74e2277daaf415b83ade8c6efab3e515e7e9603d3339779d5e5f780e30bad56a1236dd5bd2c26988
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index 63df295b3125..5cef0da2d0fa 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index 687930ef6f3f..9f16c8148376 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 1fcca0a327f8..2c49d64dfefb 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -1,5 +1,7 @@
 AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8
 DIST ibm-powerpc-utils-1.3.6.tar.gz 320582 BLAKE2B cce656ca7eefda3912f26c6df99112ceef831cac834af4edaf507c28c63d6bbca0d6ae0dd096474b7d3ac45daffb37dbc1068cb33b83f676922e4f27ca46ae2e SHA512 a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977
-EBUILD ibm-powerpc-utils-1.3.6.ebuild 718 BLAKE2B 6067af1272a54f61d86f6768027104018c4bfeea5566b2478853498e2448a8ab9bc40dad68406ffc2e514736dcc923fad526b1cf72539ea0530410a11c9c542e SHA512 fe546d95b31eb5863be2cceb585c03e7c38f80eca6ed2ed0b8bcdf140b4699c63c05ee0071feff7f651e3f11f9c8a4eda3d039a9ef32baf0ce521328b8c52f9e
-EBUILD ibm-powerpc-utils-99999.ebuild 619 BLAKE2B 0af4588dfa5d37dfa6d7300d40e9431a0c0644b9bdfc184f9559cc4043e5003520f483388b7ec217ab623a4e62d58af20e2458bdf6d0616ecc1975eece2c4342 SHA512 67b5061004b0084a8c4600ff6422ecadb3c72bc9146a65554598acf8611209f64efa6c0cb94ccf6c0b5688ef4d309d4ae174790b479b0847266413ee8d7cab54
+DIST ibm-powerpc-utils-1.3.7.tar.gz 322707 BLAKE2B 5f8e9770e35cfd2d07640d228b8cff175fc71c49518d78c3582df30472a7fe2e3c520dae014d73e37992bca5f9dd13c3203e27e286f010ad0e4e95bfc5e6aa37 SHA512 e7ced7568d4a033131a4a543bf3128ffc1d5b1f5baf358b7bb73003e713145d3191dddee63b73d475dc0e257d54dd2470b02b15ba6ba9e49bb1d110091f2a541
+EBUILD ibm-powerpc-utils-1.3.6.ebuild 721 BLAKE2B f588de3dc66e5447732d36f5708bd734d4ee354c007c522f04031134258a5f680bc1d3a4c8306da9cc0d9656634f52d2bddfd3b89147a5d11bc8edd38ea16963 SHA512 23406ddb503be7fb8894772476f4a5501f03f51c7bc8476051fd9f0fe8dc8f31727962975949872e3e73a8c89928cd0aadfae8698cc06408a19f5b74400a6402
+EBUILD ibm-powerpc-utils-1.3.7.ebuild 723 BLAKE2B b06f37eaa4f0abf574780b267f0974a3f262741fede6fc869d5388572bcebabe58d6c98b5723330c465393939b57dc957623bc1c32fb3309e52c4e340a4e2343 SHA512 cff00db14b60565c4c1a54b7e581b9696d2159c2f5d6ab5db7beeaf51119e65e4bdb1dfa5d6280ee1bbad6d1ba79b401cb80939c16a67fc86177668f781a842b
+EBUILD ibm-powerpc-utils-99999.ebuild 663 BLAKE2B 2056c18b3b2565a43ad36dc6c464a824d3b0f8b2e1ddddfa56bdf16b2280e2f05b727eec3bd891c01ae21d3eceb908618c89b8e1c181bb4867025ba98d104cee SHA512 837205f38542a2bc8129f17df2956e768bda8b9d142f394f680f83c32f1b33da265f4cb09855ab763c23e07a462ec0f34587b2e194ad1e5d1b757283da2a5049
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
index 589373034585..eefb8e27e634 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
@@ -12,7 +12,7 @@ IUSE="+rtas"
 S="${WORKDIR}/${P//ibm-}"
 
 SLOT="0"
-LICENSE="IBM"
+LICENSE="GPL-2+"
 KEYWORDS="ppc ppc64"
 
 DEPEND="
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild
new file mode 100644
index 000000000000..37767f844b18
--- /dev/null
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
+HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
+SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="+rtas"
+
+S="${WORKDIR}/${P//ibm-}"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~ppc ~ppc64"
+
+DEPEND="
+	sys-devel/bc
+"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/powerpc-utils
+	rtas? ( >=sys-libs/librtas-2.0.2 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.5-docdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+}
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
index de8638eefe23..332c9becb6e0 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
@@ -6,11 +6,11 @@ inherit autotools git-r3
 
 DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/ibm-power-utilities/powerpc-utils"
 IUSE="+rtas"
 
 SLOT="0"
-LICENSE="IBM"
+LICENSE="GPL-2+"
 KEYWORDS=""
 
 DEPEND="
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index de94836a4be4..a18ca6f29b7a 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,4 +1,4 @@
 AUX reader.conf 246 BLAKE2B 9d8f4b1066d8b30577de625966f40455e4de7773c3387417da454d0a513604c4205b93cab32bd7443c3527fb921082aeb3b1bade369a93f630c3e8f3a084965e SHA512 57ae0939bb88fa67224583fcce555eeb4d088c5c0667a4ddd02323a45554f391a1d9b6d5a124b7e3e9dc933806b0067deb7f159611a9df89e922d8a3f23e737c
 DIST ifd-gempc-1.0.7.tar.gz 76712 BLAKE2B 5ae734ff97865a66d993fc67a2ee5537875773b8275a2125c8853ddf0006cea61f20cd38571be44126cb2cfeb16a6778d6917fd056616e24997a3aed85226e76 SHA512 dde143bd2ca46cca91f979ddbb300f0b5fea37ecfa0c67058d887fcd56edf58adecce85dd05c7af25329fdfcfdf5bf7a52d4dc24061231a234180aad3df44a93
 EBUILD ifd-gempc-1.0.7.ebuild 1537 BLAKE2B 6cac5b7566bb320861d7caa73f99631a16528d2fbd1a7988857c1aad6cf33dd3649936a87286a1d97cddb257942f01aab7aa952149ffa36b0bc6074497fdc303 SHA512 57e0bdc819803442ccf03134cc68b58ffc35e342075f2d236717640059c6af37d0c5081f560e6d08e87990a0d615b695f681481775bb76ddd3de87c0d94bac8a
-MISC metadata.xml 392 BLAKE2B 3f8b9189d2059af24ba6a347c5ed7189ccd12a601b999280d7647290dacc8823536f20a2f8661812eb3e905ba893f4d0d23cee96221611128f470cb3e7123082 SHA512 e89ab58445d44633b06222f0518dee3fa80687fedb2f31df3aa86ab2e157e2ff3afad0ba5e37f2867ba738ae12dec403f76adc908e0a008b3fd1b32217724b6f
+MISC metadata.xml 323 BLAKE2B 2ee45beb0620e037d819dab92d0849da60b391d9ac33eb004b77de9d5b14ad8afbf1021eeacc005819b59b9191afffcafbbeafb027687996ec39a8cd73c674ad SHA512 e8e4055840bec6320a0bd76fd12cffd63fa63e96f53dd3623f2ae9697fbd992cb7961d5d7eb327b296dae035eb0f645848bfe1bb30a09958efb60543a6459fa2
diff --git a/sys-apps/ifd-gempc/metadata.xml b/sys-apps/ifd-gempc/metadata.xml
index 9a6a5c1396ac..c10caf905e1e 100644
--- a/sys-apps/ifd-gempc/metadata.xml
+++ b/sys-apps/ifd-gempc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 <longdescription>
 	This library provides PC/SC IFD handler implementation for Gemplus GemCore based
 	serial and USB smart cards readers.
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index f4e68df58629..0369587d7cf2 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -3,5 +3,5 @@ AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659c
 DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5
 DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
 EBUILD irqbalance-1.5.0.ebuild 1322 BLAKE2B b7c9fdaeef6a657caa89f3f1cdd641b55c82657bfb8a81d9cb7ec16387c5bc0e6629f655fc675f7485931a5480276aa56d959e81d22ab11c51343e54a7f29f02 SHA512 0557b7a96c9a1b23ee82e524b90d9253699cd2b3c31b566db027838cf7b33b01b55ebfd3a8bd49ee9001110e2aca6058cbdf2604f56f5311ce5143c0b360a7e6
-EBUILD irqbalance-1.6.0.ebuild 1309 BLAKE2B 6ea42f237e543cc39a7327be36cb390af4db3b45d68548026526c66ce979116246f34e08232f264a5f072cbda70bc0605d24186d2e9fd92c2112a1503f9a6bc3 SHA512 4e8b97047793e1cbd5775978062b050be83eba0eb4694b4018ec233fa69f2db9d99b32b020d2f373c8c186d2be112695b0e11e9501d402e4f8431f0bbae7ace9
+EBUILD irqbalance-1.6.0.ebuild 1316 BLAKE2B 71ee6759be62e29b13d73c5202f2ad6ec71032ee358b119e9a43fbd1c34307fede6b17876e61ab90996889fb2ba66de703f6177a101bd17d8a252f06b4e80923 SHA512 ae5918677868c520cd522eebfc4b061249001a3b043fd3b4e8d0ced8b33440b60d0c337df2ed9da703bf206c5ebf09f09c7762f69fe45a217c9cb50da597c421
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
index fec100e24229..67985c354e89 100644
--- a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/kcheck/Manifest b/sys-apps/kcheck/Manifest
index c4daacc73a52..fce85523dcc7 100644
--- a/sys-apps/kcheck/Manifest
+++ b/sys-apps/kcheck/Manifest
@@ -1,4 +1,4 @@
 DIST kcheck-0.0.2.tar.gz 8519 BLAKE2B bc1a4355e1d55118386b34d6f5aca0f11cbf519c0f7d3bb0cf143cca4682af782e6728585fa6dd36c21fc6cea73d21d0ab35571f93096b9eba4a9b461808f2b0 SHA512 98e3ad4835f8c1bacf68f98e112c05788394feb00683b7a02aa92cc2b5f8b4edeebe2b962c07a171b06bdfe7324e715d58057f6c8550004acc52cc0d9105ba9e
-EBUILD kcheck-0.0.2.ebuild 721 BLAKE2B 30fbf7b488eca844572f07c18bef7866e528b02b8b2803e15ab4de31cf1bca44f797783727ba2d029052e0bd364cd6be33b4f7cbf44d34ba7c55ffbf78db67b4 SHA512 3490ef7ad617611c32199fd31b5e931b228a9beb02c73959cdfc865990d8e0139879f61ae7ec4571d33ed3ce2c3a051926cfc760ff898c2a0fdfb6a2990a7d97
-EBUILD kcheck-9999.ebuild 721 BLAKE2B 30fbf7b488eca844572f07c18bef7866e528b02b8b2803e15ab4de31cf1bca44f797783727ba2d029052e0bd364cd6be33b4f7cbf44d34ba7c55ffbf78db67b4 SHA512 3490ef7ad617611c32199fd31b5e931b228a9beb02c73959cdfc865990d8e0139879f61ae7ec4571d33ed3ce2c3a051926cfc760ff898c2a0fdfb6a2990a7d97
-MISC metadata.xml 379 BLAKE2B 14953c7f159907df7200d828c89ed1e9eb58f6e897df2d47440597eb6ad0fc2c6aa073740a84ea66b7155f2b9f67995d4e690c34e0ce3f62a6ef6d33bbd65eba SHA512 eacab147f9aba06b6daf3867f6fd34568e05dbeebf6ad54accd364d7dafda18a2513e0dead09de6664f9166694498296246be16f38e2cdf5816e238870743b49
+EBUILD kcheck-0.0.2.ebuild 717 BLAKE2B 0793e11208a90c5191c3fe69acc39e390e018408f8ef4494a24efb66bbbe1485f15bfc6b943f5e5eb5c229a28d4f947639d4bb043d6ef419e3902a51cd320357 SHA512 21c316176669b7edd8b1922324a81501e1de2ee1f3f4d10f90baeca21aeb376412c050ebc5edef4f85bdf8ae1225fe6a33bb698904a72182a8e813fc59605362
+EBUILD kcheck-9999.ebuild 717 BLAKE2B 0793e11208a90c5191c3fe69acc39e390e018408f8ef4494a24efb66bbbe1485f15bfc6b943f5e5eb5c229a28d4f947639d4bb043d6ef419e3902a51cd320357 SHA512 21c316176669b7edd8b1922324a81501e1de2ee1f3f4d10f90baeca21aeb376412c050ebc5edef4f85bdf8ae1225fe6a33bb698904a72182a8e813fc59605362
+MISC metadata.xml 454 BLAKE2B 702bb365aaf1973836df525f21ce379cae10843934cf3c7d8544e66f95853c2b337a259415893261cd3099d43a0e3e73a506b39d48be33f2031417cb8df0882e SHA512 a77c738e7cc92789a2e857e6bf540c516e44358a2b87fa2448ab237f576d0ad674dff645361737d834f4c94d7904f1f8408ebbcf101aaea71c9827f4117ee1ea
diff --git a/sys-apps/kcheck/kcheck-0.0.2.ebuild b/sys-apps/kcheck/kcheck-0.0.2.ebuild
index 3b0e9ef42b3f..2d83fb1a653b 100644
--- a/sys-apps/kcheck/kcheck-0.0.2.ebuild
+++ b/sys-apps/kcheck/kcheck-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/kcheck/kcheck-9999.ebuild b/sys-apps/kcheck/kcheck-9999.ebuild
index 3b0e9ef42b3f..2d83fb1a653b 100644
--- a/sys-apps/kcheck/kcheck-9999.ebuild
+++ b/sys-apps/kcheck/kcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/kcheck/metadata.xml b/sys-apps/kcheck/metadata.xml
index 8cd18c2f183e..64e95068812b 100644
--- a/sys-apps/kcheck/metadata.xml
+++ b/sys-apps/kcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/wraeth/kcheck/issues</bugs-to>
 		<changelog>https://github.com/wraeth/kcheck/commits/master</changelog>
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 38f01767a3da..7ebe7f32d1a2 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,5 +4,5 @@ AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-EBUILD keyutils-1.6.1.ebuild 3881 BLAKE2B a4d2e8b5706b3f7cf6d9536a1e6a90c81c1590860244e4a132a670efa24211e822ec6aa469851be226c7d52b4575cf0c0b11ee1ff3d8d3b32593ec5b322e141f SHA512 40f28d6f85afc9a248b7d8e467bfe7e2e2feb93418f4800d3bc3680f702116b18b86e0a79468df27f5ee99e0f238722e97f879eeee060c16caf799c08e2ff9ff
+EBUILD keyutils-1.6.1.ebuild 3878 BLAKE2B 203178a35f492a10db8e001cc5e4dbff9e78181af1740770f687737577d40fa56451007944b61fe42cbbe4c6e02f034f8dedcffbf813fd5cfeaa79295693c0e4 SHA512 9d4eb304d620f94b9b148dbe6afbcc8c221b8a4d857984b0e905c65a95f1ee57edad1452e7d58fee27e127118e1734acef58dd7e3fd1f04dabffe39859f97e1e
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index b69a471cf390..007040d08970 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index f50f09f7688b..835fd7a7aa64 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,7 +2,7 @@ AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
-EBUILD kmod-25.ebuild 4924 BLAKE2B d7fbc42a9d490d10c0fca9e590c7e0cf8520ee7bf80d780d33a08af22e46fea044725d3ec2e5c49f0520d17721f97130e06212d823972aea9387c2b3cda80d04 SHA512 3fa591487100ffe314c1a7f34d598cb1188c89893462a57f6b497baeaf702af6a154b4d36967304fcba144aaa92ad0897613eeed4e33b5d802a06444cb88f803
-EBUILD kmod-26-r3.ebuild 5099 BLAKE2B ff5537121ba86c2330e90a1cdd72792004db00406561c1f857a8dea5898254aac380b586a02acaee9765b131e5e4eb3894d9f1a3970132becef8be23ab763c5f SHA512 3e307565d986344541463840821727ea3d3b289c686eef04ceaedd2be6bcd5eb52538b92d14de86bbb8b178d7214e10231cb9d35b064cb590880e4dab8c57494
-EBUILD kmod-9999.ebuild 5044 BLAKE2B a8db971037a2c312826f62fa882a1a1e7665b15067fadf0a8017c38ffe25083ba64fa26c3cbacb74498b4a8b9c210076a159a80e3b0b1a7a5cfe63054c70e5f9 SHA512 dbc278ce5db407abcfa1b125f0c9ddcb868ee88765febdc96faabb6527ab21f40d7edba7a3a0cb8165b5624d19641442dd548ac469b0292aa423201f93fb0067
+EBUILD kmod-25.ebuild 4920 BLAKE2B ceebc0887a34d75567e4021ea9ceb2ac55efac20b1ed3aedb6a6d85e754b82c10ac5c0b7091c681ca17294c81371dd8afc9da35752bf4a0ebaf85963526ac359 SHA512 97ba9657e7f12b0cde5528d1b7103f37418ba4f8067065f7f9f7dd2492a3ec4a7401b72a63f5069b8956b762ed53863c8bb76b7ef7b8369a20f6b865716bba79
+EBUILD kmod-26-r3.ebuild 5097 BLAKE2B 66ffbd36540c7fca42d7ce3543148078fd014b50c4ae0ffdd25553528d9aec44045b3eda1995b2516fcdbc7597f227ab93a9666fbe958adc5c3509a41cf4de5d SHA512 2cf272dabc083dde5129255afb1513fafb6c2f887f75e8eccb143472058dc48614c7a3b793b192680988cc438cfc90457e1b0c24dc6835b486dabf305e80787f
+EBUILD kmod-9999.ebuild 5042 BLAKE2B 7d9fd11c684fd765d0c33723bce8e8052ceab3a29af68636e196ad387e078eaf946588ef67e774756a3dd98e0b4773ce70137f10f21d4065554cfb2040fd07c2 SHA512 2cb592efc195f14862b6582a6929e65fe62e39b83ea6a492dcec2ce309c27a1ec17530fd99bf74802df697778e9f176cdf739ccaea3bd2f0c2dde983795b36a0
 MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild
index 885f06a97767..bb4d910f6e44 100644
--- a/sys-apps/kmod/kmod-25.ebuild
+++ b/sys-apps/kmod/kmod-25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit bash-completion-r1 ltprune multilib python-r1
 
diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild
index 2e7ab7e1654c..05daf07d4139 100644
--- a/sys-apps/kmod/kmod-26-r3.ebuild
+++ b/sys-apps/kmod/kmod-26-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 2cf70d9af7ee..3313669d60c9 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 5ed48b82c6f0..d4e788b630eb 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,6 +1,6 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
 DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
-EBUILD likwid-4.3.3.ebuild 5527 BLAKE2B 611309f785721f1165dfc2bddfe2239a5eb0ca3ee0203bdf682ad9548df908c1a3a4d89067bd6e23350d9b72ef59d452e2a6035d0f56bbe6b9f075a5283a1807 SHA512 42470c479de12fb3176af290559c595fd30488c790ceba97bb1c619b2ca4f010f9895f75e6206cea50b442c583070b568eda741e9d702cc253d37f550b01a88e
-EBUILD likwid-4.3.4.ebuild 5527 BLAKE2B 611309f785721f1165dfc2bddfe2239a5eb0ca3ee0203bdf682ad9548df908c1a3a4d89067bd6e23350d9b72ef59d452e2a6035d0f56bbe6b9f075a5283a1807 SHA512 42470c479de12fb3176af290559c595fd30488c790ceba97bb1c619b2ca4f010f9895f75e6206cea50b442c583070b568eda741e9d702cc253d37f550b01a88e
+EBUILD likwid-4.3.3.ebuild 5525 BLAKE2B acf7c8406f2214a73316355eddb48e6df34486dac26b19a3591aa447f8c5b2426cd988d27a1d38b6e24b5aa57d8f6d9025b3bda9fa259cb61b39606bb04f19f5 SHA512 fb000432478a1219153a45b05b389455cc462d017a6a965b0d25733fe05248cdf16a4c50887b4dc62b4877a31498ea810d230de2dfdcf14a8b1ce72f1a65aa95
+EBUILD likwid-4.3.4.ebuild 5525 BLAKE2B acf7c8406f2214a73316355eddb48e6df34486dac26b19a3591aa447f8c5b2426cd988d27a1d38b6e24b5aa57d8f6d9025b3bda9fa259cb61b39606bb04f19f5 SHA512 fb000432478a1219153a45b05b389455cc462d017a6a965b0d25733fe05248cdf16a4c50887b4dc62b4877a31498ea810d230de2dfdcf14a8b1ce72f1a65aa95
 MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
index ef60b4927a7a..1f4427478f9a 100644
--- a/sys-apps/likwid/likwid-4.3.3.ebuild
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 FORTRAN_NEEDED=fortran
-#PYTHON_COMPAT=( python3_{5,6,7} )
+#PYTHON_COMPAT=( python3_{6,7} )
 
 # 4.3.4 will need python-single-r1
 inherit fcaps fortran-2 linux-info toolchain-funcs
diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild
index ef60b4927a7a..1f4427478f9a 100644
--- a/sys-apps/likwid/likwid-4.3.4.ebuild
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 FORTRAN_NEEDED=fortran
-#PYTHON_COMPAT=( python3_{5,6,7} )
+#PYTHON_COMPAT=( python3_{6,7} )
 
 # 4.3.4 will need python-single-r1
 inherit fcaps fortran-2 linux-info toolchain-funcs
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 24a61f4d40c8..c83124591e42 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -57,7 +57,7 @@ DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD lsd-0.14.0.ebuild 1163 BLAKE2B 175ce505dd0d0dda5c45f9a28438cc9a42aca08ff6456e24353177260e23c2b624a9c37960fd44e24bb2545c44e6575ffbe68b854e2ffc381d5e14b2a3be45aa SHA512 c2017256d9a8f218b828944157420787805787362c74d12953c523d8a51ba4090ff661bbc5c05562c84c4fcca062fd8459260f4ae6f56a023e32641c50442f56
-EBUILD lsd-0.15.1.ebuild 1198 BLAKE2B 20831852880793d640f57e149bf15cbe3249329f28998f5beef8174bb911a03e28a8c091810883e52a822eace54131021d7af6e33b5407930b07aab1abb53e87 SHA512 11b31ade354e54d4676ab386c4f2bf079883ac4d0d1e796f32c7a84a416e1b85e01ba49552593685f102ce108dcd314c647f034c2de31bbbb1cdb6221b5b17d8
-EBUILD lsd-0.16.0.ebuild 1376 BLAKE2B 9520dd82a54653f1298ff488ac1f8167713f325ce3a953d45be6c800caebad2817a7e8f7111f9827537e88c305e0d879528b1d0ba02ad2af3e13e3ca0296fbbf SHA512 1951bb3be213e65e3a06ace2d466617bfb0f1ca2c2cc37958ef27d512474ff3da51ba76cefe1582f232c7daecc01e8fad484376c73e700a0ea28673ffea064b9
+EBUILD lsd-0.14.0.ebuild 1154 BLAKE2B 45ffaf39e643b70e0e2453713aca6ba322272da53bd0ce000a5339a61e775182489b4ef2dd631188e8e64f1171a46e9c3e2e711b80d132226f8a34b7f6185de6 SHA512 dd2bb09ad11b71b76450b65cd9e9746560c2772ccff84bf63da732f821389d3ed680bacc9e4730c52f6122150088edf675e79299f2265a864c3dae267c3d6a11
+EBUILD lsd-0.15.1.ebuild 1189 BLAKE2B 3bec96ad60243b563b8c8890081cf93a6d09f64b4dacbe911a1dd9073d8254b899ad117cdf7f100a5587e07cf7d7f26546e5bd2374378ad3bfaad0420e98ff1d SHA512 ba21e92adf01cb1d1f2b8bd0ca3bdd92d481c75595da711f678763b8e308e1ef8977c00f6ade5d67a8d2c1a76ec12cdc4fd33357105ae070777a4e0e0395aaf4
+EBUILD lsd-0.16.0.ebuild 1374 BLAKE2B 49ad2f24d1abed9b14e21a8f39b1dfd0ed03852031924bfc72f008a55378c972a92549682d7fef901cfd614df761a0c2311661c546c2ebed89f58064c56e81d4 SHA512 ace02a735799b2b0effe0427a136ba2d5c058525255523d8bc994c1a7df58995aef9ebd6dadbd193801a4ce30b23375e2147aa278e60f76980bb533565be6134
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.14.0.ebuild b/sys-apps/lsd/lsd-0.14.0.ebuild
index b7706acf02f5..e8451f706387 100644
--- a/sys-apps/lsd/lsd-0.14.0.ebuild
+++ b/sys-apps/lsd/lsd-0.14.0.ebuild
@@ -59,6 +59,6 @@ BDEPEND=">=virtual/rust-1.31.0"
 QA_FLAGS_IGNORED="/usr/bin/lsd"
 
 src_install() {
-	cargo_src_install --path .
+	cargo_src_install
 	einstalldocs
 }
diff --git a/sys-apps/lsd/lsd-0.15.1.ebuild b/sys-apps/lsd/lsd-0.15.1.ebuild
index 25a04b987bfc..4eb55bcbe8f0 100644
--- a/sys-apps/lsd/lsd-0.15.1.ebuild
+++ b/sys-apps/lsd/lsd-0.15.1.ebuild
@@ -62,6 +62,6 @@ BDEPEND=">=virtual/rust-1.31.0"
 QA_FLAGS_IGNORED="/usr/bin/lsd"
 
 src_install() {
-	cargo_src_install --path .
+	cargo_src_install
 	einstalldocs
 }
diff --git a/sys-apps/lsd/lsd-0.16.0.ebuild b/sys-apps/lsd/lsd-0.16.0.ebuild
index 9e3d88dadba3..39b576d104c9 100644
--- a/sys-apps/lsd/lsd-0.16.0.ebuild
+++ b/sys-apps/lsd/lsd-0.16.0.ebuild
@@ -64,7 +64,7 @@ SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -74,6 +74,6 @@ BDEPEND=">=virtual/rust-1.31.0"
 QA_FLAGS_IGNORED="/usr/bin/lsd"
 
 src_install() {
-	cargo_src_install --path .
+	cargo_src_install
 	einstalldocs
 }
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index f5223b429fde..fe4df495bd5d 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be
 DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.03.ebuild 1676 BLAKE2B 1433a18e13e90c9c0e0b95fbf6304ba4697c634ba668afa461fa9c5cdf9c925e72d7220ebc76376b4b0fce71433969c8bfb3db60f1f61c4d7aa9a31ea92e067a SHA512 cba63d2b4fc77c4bae06adbbfadf6b71c3ea6fdae6dfd1dd8e8c881c24e8c8cbc883e1067f65437b9e8f35b29c88ce539a94ba001292a0a8fd95b1afc8b08b02
-EBUILD man-pages-5.04.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
+EBUILD man-pages-5.03.ebuild 1637 BLAKE2B b5f712ca5675253a61ff09f66ba7d218c4bd3bb56dfa5b3628d534a49d701d6fcf11331f3423ed5a6e9ec8164715eaccb4d8a934eaf98f1e1f9725a34fe95a31 SHA512 d7b667878670315055fd273a1ec22d8950f94bf7c2ff02eeb914c0c523dee386f18c2e221ab5c41dbbb2ede487541e61c213ca29a3105ef0b116e196318da8a0
+EBUILD man-pages-5.04.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild
index a9922828cd45..98c651b497c7 100644
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ b/sys-apps/man-pages/man-pages-5.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
+IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
@@ -26,7 +26,6 @@ RDEPEND="virtual/man
 	!<dev-libs/libaio-0.3.109-r2
 	!<dev-libs/libbsd-0.8.3-r1"
 PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
 	l10n_de? ( app-i18n/man-pages-de )
 	l10n_fr? ( app-i18n/man-pages-fr )
 	l10n_it? ( app-i18n/man-pages-it )
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index ea909f0780a0..63013ab5b776 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
+IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
@@ -26,7 +26,6 @@ RDEPEND="virtual/man
 	!<dev-libs/libaio-0.3.109-r2
 	!<dev-libs/libbsd-0.8.3-r1"
 PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
 	l10n_de? ( app-i18n/man-pages-de )
 	l10n_fr? ( app-i18n/man-pages-fr )
 	l10n_it? ( app-i18n/man-pages-it )
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index f30cf2a821a7..9e48e9d09aca 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -3,5 +3,5 @@ DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
 EBUILD moreutils-0.62.ebuild 1511 BLAKE2B a978a0b7539b353d9f5f8e015a884a92b91c79a296f74cb757599ebabc651e225c37a85c985f36f76f50f5d1a9713c1377a8c16566ef7b3f215e68b5530418ad SHA512 984edea18c99ca61c8e621c6f1e55a54fe9ed247d16dbe63cc16056a807f78c419b0ead508b70117e2b150ca058577d857f7dd8aeaaac00acb4bcb9086038660
-EBUILD moreutils-0.63.ebuild 1446 BLAKE2B 5f30e43ea111686b13e95274432781855407aa0f8ec89d9ad628110a2d274901d29571f22f75212b717d0ac01e4d5ff3e8340edee87d2d0487742651b5f55761 SHA512 d23bb38c207477ef572576c85ec285f4eb67d8b89ff004dba2786a9da4328fe289064e8268945e7706ce549d0c2e4b0ce6e41dbcfaaedbd600fe806385c04038
+EBUILD moreutils-0.63.ebuild 1445 BLAKE2B 6cc4d0da336dd2aa3ea2bae611253c81d04de85ba8ca33da362130f2369c3360e403b772df2e53aba4958316929b8357b59173fa0f91d63b694efd5af12697a9 SHA512 5f187b5e75a072caea587b68f0349936af3f267114fe5c18f25b3a005ca71bc0c35494a974d7707ae4de58a44d96458cc7eb0f9e6d9e398635083d1ba55acf80
 MISC metadata.xml 237 BLAKE2B ceac7f98433ef3d26c4e5c452f2c41f30625ed0209982872213cc4917ad45d1dc64077b5adbc7e2aa14a86feb86a218a64d5f4d1829534b452516ffea6d6fe48 SHA512 38f6b51bed4a582dfe6137eabd3929e59232bfc626f6661cf936b7d00959d75591cb77ac900e1ad1d20c9a13097a2c08e39442cf5e6201dccfd2cfcfb5d989f7
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
index d0df8cd6e4ec..cda09be7454f 100644
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
deleted file mode 100644
index 8328c2f2d993..000000000000
--- a/sys-apps/nix/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
-AUX nix-2.3-bootstrap.patch 1688 BLAKE2B 4bcb38019f1d310a8a888a76009942986881e426f030b626dbeeba1ece37f2e0c94fc2f44f37535bc89a1b946979cd827e33c5d407896989a9771bffa0a90143 SHA512 3f23dfc1941c848d7ef82c1990f0eed946241f6f331bd85f511ed72096b2685a285e2c2248fb30499376f3a80fa19e411543819d16a4fae732dd0ae98bb55236
-AUX nix-2.3-libpaths.patch 2856 BLAKE2B 06f6dba50811e353908e5faad56671e433c88a8054a4f0056c6b24930bfc7747baf8f138db64c8da0a0e73847568277238801f0a13436f38ca78e3037092fc82 SHA512 aac5f322f6a0565e4d38c272e51c49a31b9388b9ac29ee3aae509630e8fc1c7f02a726bc60a1d3c8400768b84f93088cc59d88f2cec79ae86814dba501bc72b7
-AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-2.3.1.tar.xz 844608 BLAKE2B a5c8e97aad8bd8dea644f8aa04665cc078a69c7203891c469900ca1b1450a5714281209235bcaedbc6f3f128e0c11aff41850f3b0815ef657e13de3364ff0188 SHA512 791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f
-DIST nix-2.3.tar.xz 844640 BLAKE2B 09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096 SHA512 45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425
-EBUILD nix-2.3-r1.ebuild 3272 BLAKE2B 1c424c2719280ed7fbce7afdb78ca4be1ccfef87482d03b65dfe00ec4d94468c07e6da002cf5a3b0505947738c8cd9cff01190a5b1421797727d7685641ae8f2 SHA512 4f50b81aea9ca9a7273e1034f1c75f73b1d656dac3e37d09d4c3ae71307a772f3025fe9e6d38619fb0cc096d51d35594289f6c035efe5fb102a0576f8759af08
-EBUILD nix-2.3.1.ebuild 3424 BLAKE2B 1e34b36fd1331a69d905873c816b9357b3355bc7fb1b314827690a28816d7aca00195585a4b9694261594b1a49e4182cdeffa7210f5c420a86a57dab4cefac7d SHA512 847a6d575d1bfe930db2a0d62818b1f3299877385ad7ae267646da8204c50b972434cbc2022a29cf68df02da1e2e4ad92181f49ea66bd95da589af2e2ee610d9
-EBUILD nix-2.3.ebuild 3231 BLAKE2B b2e5f42f29ffae7562682a41dbb91f29472cd765c0a63731b35fe2cb2d9da301fcba5e6b88722e4a6de5cce31c1cd0f0cf7a7e58fc1b61ffc581a3434260208e SHA512 d762b40003a6aff5f2d5b8080d22e9f8570e747a4a66fe2415d91e6089b44a58a6dc916c0caa6d8fd89bad7a14191c31635306deb7560193485b7a8f2c48a645
-MISC metadata.xml 681 BLAKE2B 54f534400a087cee24ffe30820268dfff9a3bc479ba287ef3d0a9049028938bbc6f07572a436c190226d04f37e5459ff0cd994c438a2664f12c211fb6773b4ad SHA512 94aa8dd9b21a2303c3844ac2d6e86812b4b764c2507ce1c237d31f5663b216c0df6d81669f824eb11d28706364b996f722c5768cbe707e3c4b3169bd6e84ac87
diff --git a/sys-apps/nix/files/nix-2.0-user-path.patch b/sys-apps/nix/files/nix-2.0-user-path.patch
deleted file mode 100644
index 486a05bb5959..000000000000
--- a/sys-apps/nix/files/nix-2.0-user-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-On gentoo 'id' is /usr/bin/id while @coreutils@ is /bin.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index a5f5227..1dc5379 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -2,3 +2,3 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
-     __savedpath="$PATH"
--    export PATH=@coreutils@
-+    export PATH=@coreutils@:@prefix@/bin:@prefix@/../bin
- 
diff --git a/sys-apps/nix/files/nix-2.3-bootstrap.patch b/sys-apps/nix/files/nix-2.3-bootstrap.patch
deleted file mode 100644
index fd656e0a1ecc..000000000000
--- a/sys-apps/nix/files/nix-2.3-bootstrap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix `nix-channel --update` does not work on freshly-installed nix.
-
-# Why it does not work by default
-
-`nix-channel --update` does two main things:
-1. fetch new tarball with nix expressions
-2. unpack that tarball as part of the build system using
-   a shell script derived by unpack-channel.nix.
-3. install the result into /nix/store
-
-
-[2.] fails because tarball unpacking runs in a sandboxed environment
-a container with /nix/store and /bin/sh mounted.
-
-unpack-channel.nix needs bash, tar and xz binaries in PATH.
-These are normally provided by bash, tar and xz packages from /nix/store.
-
-Unfortunately bash, tar and xz packages are not yet fetched as we
-only have nix installed without nixpkgs tree.
-
-# How we get it working
-
-1. we patch unpack-channel.nix to only require 'sh'
-2. we use /bin/sh as a static busybox and point nix at it:
-   ./configure --with-sandbox-shell=/bin/busybox
-
-Bug: https://bugs.gentoo.org/693482
-Bug: https://github.com/NixOS/nix/issues/2673
---- a/corepkgs/unpack-channel.nix
-+++ b/corepkgs/unpack-channel.nix
-@@ -6,15 +6,9 @@ let
-     ''
-       mkdir $out
-       cd $out
--      xzpat="\.xz\$"
--      gzpat="\.gz\$"
--      if [[ "$src" =~ $xzpat ]]; then
--        ${xz} -d < $src | ${tar} xf - ${tarFlags}
--      elif [[ "$src" =~ $gzpat ]]; then
--        ${gzip} -d < $src | ${tar} xf - ${tarFlags}
--      else
--        ${bzip2} -d < $src | ${tar} xf - ${tarFlags}
--      fi
-+
-+      tar xf $src
-+
-       if [ * != $channelName ]; then
-         mv * $out/$channelName
-       fi
-@@ -26,7 +20,7 @@ in
- 
- derivation {
-   system = builtins.currentSystem;
--  builder = shell;
-+  builder = "/bin/sh";
-   args = [ "-e" builder ];
-   inherit name channelName src;
- 
diff --git a/sys-apps/nix/files/nix-2.3-libpaths.patch b/sys-apps/nix/files/nix-2.3-libpaths.patch
deleted file mode 100644
index 42931e7e8d5f..000000000000
--- a/sys-apps/nix/files/nix-2.3-libpaths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Workaround -L path order by passing local library paths before
-systemwide paths to avoid pulling libnixstore.so from system
-instead of locally-built library.
-
-The patch is not perfect because it passes LDFLAGS after local
-libraries but it makes nix link correctly.
-
-Bug: https://github.com/NixOS/nix/issues/3087
---- a/mk/libraries.mk
-+++ b/mk/libraries.mk
-@@ -91,7 +91,7 @@ define build-library
-     $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
- 
-     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
-+	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED)
- 
-     ifneq ($(OS), Darwin)
-       $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
-@@ -105,7 +105,7 @@ define build-library
-     $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
- 
-     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ -shared $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED)
- 
-     $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
-     ifneq ($(OS), Darwin)
---- a/mk/programs.mk
-+++ b/mk/programs.mk
-@@ -32,7 +32,7 @@ define build-program
-   $$(eval $$(call create-dir, $$(_d)))
- 
-   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-+	$$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS)
- 
-   $(1)_INSTALL_DIR ?= $$(bindir)
-   $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1)
-@@ -46,7 +46,7 @@ define build-program
-     _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
- 
-     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS)
- 
-   else
- 
diff --git a/sys-apps/nix/files/nix-daemon.initd b/sys-apps/nix/files/nix-daemon.initd
deleted file mode 100644
index 1fd42734c0a8..000000000000
--- a/sys-apps/nix/files/nix-daemon.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/nix-daemon
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --exec /usr/bin/nix-daemon
-	eend ${?}
-}
diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
deleted file mode 100644
index ebcafee28dab..000000000000
--- a/sys-apps/nix/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<use>
-		<flag name="etc-profile">Install /etc/profile.d/ entry to inject nix support for all users.</flag>
-		<flag name="gc">Enable garbage collection in the Nix expression evaluator (use <pkg>dev-libs/boehm-gc</pkg>).</flag>
-		<flag name="s3">Enable Amazon S3 bucket to load and store packages (use <pkg>dev-libs/aws-sdk-cpp</pkg>).</flag>
-		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/nix/nix-2.3-r1.ebuild b/sys-apps/nix/nix-2.3-r1.ebuild
deleted file mode 100644
index 30e6c06b9449..000000000000
--- a/sys-apps/nix/nix-2.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-	"${FILESDIR}"/${PN}-2.3-bootstrap.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild
deleted file mode 100644
index df8590b23b50..000000000000
--- a/sys-apps/nix/nix-2.3.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-	"${FILESDIR}"/${PN}-2.3-bootstrap.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_pretend() {
-	# USER_NS is used to run builders in a default setting in linux:
-	#     https://nixos.wiki/wiki/Nix#Sandboxing
-	local CONFIG_CHECK="~USER_NS"
-	check_extra_config
-}
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.3.ebuild b/sys-apps/nix/nix-2.3.ebuild
deleted file mode 100644
index 2a368774542b..000000000000
--- a/sys-apps/nix/nix-2.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 6ade4b52b057..a5438bd452fe 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,8 +1,5 @@
-DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
 DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
-EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
-EBUILD nvme-cli-1.6-r1.ebuild 637 BLAKE2B a8b970784c99af27bcd317bd4b246d97593eb6e9db69a35d7e5e5c12d1baeefa9fcbfc94c3055150d45bbd408714d8f756d82f92496512870ccc45e51b7582f2 SHA512 3fe25b46e5fb9135b15847def70cc9c41860e0f0ad9682f434229b2eaef5672a5416a6743fe2e351f3ed9244b33536e1555da4eb7f1b653ee0fc974c3df2b859
-EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
-EBUILD nvme-cli-1.9.ebuild 690 BLAKE2B a26c6767332f9b392eef0af763ff15cd35a9b89380b25dc75ee97d444bafde2e8b7ce5efe23e7c5c14ecc9506b6a28b57a62ba5bf742dbe84f8d648ebb1ba0f7 SHA512 fc44875dacbfe58f30b8877663a2e05fdf3788472cbc4658c39ba8e72de7a998d545c63bd6fce5aa47f05aebd8f9bfb5694ed5ce3974406db1985baf2b5ef837
+EBUILD nvme-cli-1.6-r1.ebuild 664 BLAKE2B d0a5180d05af47aa3eb62a81de561cc5cc42fae37e1f93fa86a88b438dd0b3d967b86a9396124e70fb509fa74940377d855a5b00c77327562ccced4b376ee696 SHA512 6e922366a20a4ac14d52a0db689620e1140e9b146866adbf154e694e072fc8bf6f1840435ac133a64f42b91e5505fd62f0f21c0e0b9400e1c24e20d5ee77c199
+EBUILD nvme-cli-1.9-r3.ebuild 969 BLAKE2B f1a37b7e7b37aa1c5db5589ccf8f24b236f098de4493e3e11e27dcdb39499d920270a94d9c02fa48cbca6dd52033a48f469b7165d216338e4160413ec49b402d SHA512 3d427d5b6d948e33de7b099ff91349c829dc956e37a2006bfc45d0ffb3a26e336925c8446f39315d1d269150cbbdc7014cd45e4150cf13cbfce163afa3c4b0bf
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
deleted file mode 100644
index 66b123fe5141..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="udev"
-
-RDEPEND="sys-libs/libcap:=
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export CC
-	export PREFIX="${EPREFIX}/usr"
-	MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
index 76ed63bdc6ae..812b18c43f2d 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.6-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
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="NVM-Express user space tooling for Linux"
 HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6.ebuild
deleted file mode 100644
index fcd1d034c4d0..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="udev"
-
-RDEPEND="sys-libs/libcap:=
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export CC
-	export PREFIX="${EPREFIX}/usr"
-	MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
index 3be939cd58b7..9d9a923835b3 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs udev
 
 DESCRIPTION="NVM-Express user space tooling for Linux"
 HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="GPL-2"
@@ -23,10 +23,15 @@ src_prepare() {
 	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
 		-e 's|^install-hostparams:$|\0 install-etc|' \
 		-i Makefile || die
+	sed -e "s|/usr/lib/udev|$(get_udevdir)|" \
+		-i nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf || die
 }
 
 src_configure() {
 	tc-export CC
 	export PREFIX="${EPREFIX}/usr"
+	local unitdir="$(systemd_get_systemunitdir)"
+	export SYSTEMDDIR="${unitdir%/system}"
+	export UDEVDIR="${EPREFIX}$(get_udevdir)"
 	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
 }
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index 04482c038b72..6e3ebc59c56d 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r2.ebuild 798 BLAKE2B 8ae98a9026fc1d4b6b0ffe78f82d8e92dde9c5a454f91151de70c6776b8527bd4ace89d2ecb48e1ecf63c2e34d1008fc595a376fb65c926a175dc2a065adf1ae SHA512 ceefdb8e3ab41994d57df626c11530ea373d50a343a1f61adb3551894217d76eee48b01491685f1c63efdb5879d4ae6b8ab26ba9603bff28cdbee09d5e3b15d8
+EBUILD onerng-3.6-r2.ebuild 798 BLAKE2B bd123936c7413d4db82f661380131b9e4ea26723627227138321c2f17b7d31fd4f217559f57e71a17888ed010584cbc8d5c54c263ffddd53167407c83d3d1c93 SHA512 d8ff8c649741599e416e9984fa28272f51d6ef4d795424ba960b7cc8f00c75f446646972bc64a15c38ebd943ecc8cd9771f218120be8fc621bfdf29959afceac
 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
index 36fc8bc0583b..4436a635d372 100644
--- a/sys-apps/onerng/onerng-3.6-r2.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit python-r1 udev
 
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index d38af50046d8..cfe9af0dc50e 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,5 +1,7 @@
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
+DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.5.tar.gz 2080841 BLAKE2B cd8bda3b7f3bcbc620f922a6baa69f452a95c60a96eb9adf67d781dc5d1a75fc43cba7aa3ed82105de7a04041cfb61f43e909794702564819cda6f11afd23815 SHA512 f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571
-EBUILD opal-utils-6.5.ebuild 2172 BLAKE2B 08a34fecb2957b97edd28259f8d3a4749c184a5a1be06840621c73b902563f1e7c8b565973d4eb919747f392cfe8b84e860afa61d8afe4252c444545093b1892 SHA512 01f37623ff3b6d00c098017676bf9cfcee0cb898be9700682136d0c4352e5b60669aa4e1b64bd61033ed8bb07a8424114cc8e390d5f5426f9b98237de97fbc61
+EBUILD opal-utils-6.5.2.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
+EBUILD opal-utils-6.5.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
 MISC metadata.xml 975 BLAKE2B e3185490ec22ed5c776c9df2a627e698e6a3d35085694d397df52c965d3c23dd57f628289ea660a24f2623d5821fba838e504bf15a77d86e3a55b42bfc7ffd8b SHA512 0fe842a12d4c5f34b6042b91b5c63fc7354e17f8228841809305006f84613dd6d894d2780725f1046beb7fbec04a17e1e08d54db37ab027f275f3543c5bb5b56
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
new file mode 100644
index 000000000000..a5c514c95a77
--- /dev/null
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="OPAL firmware utilities"
+HOMEPAGE="https://github.com/open-power/skiboot"
+SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+	')
+)"
+
+CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
+ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
+ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
+ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
+
+S="${WORKDIR}/skiboot-${PV}"
+
+python_check_deps() {
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
+}
+
+src_configure() {
+	tc-export CC LD
+	export OPAL_PRD_VERSION="${PV}"
+	export GARD_VERSION="${PV}"
+	export PFLASH_VERSION="${PV}"
+	export XSCOM_VERSION="${PV}"
+}
+
+src_compile() {
+	emake V=1 -C external/opal-prd
+	emake V=1 -C external/gard
+	emake V=1 -C external/pflash
+	emake V=1 -C external/xscom-utils
+
+	use doc && emake V=1 -C doc html
+}
+
+src_install() {
+	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+
+	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
+	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
+
+	systemd_dounit external/opal-prd/opal-prd.service
+
+	if use doc; then
+		rm -r doc/_build/html/_sources || die
+		local HTML_DOCS=( doc/_build/html/. )
+	fi
+	einstalldocs
+}
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.5.ebuild
index bbde6d6db522..a5c514c95a77 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index af2bff7b4e18..f27f6dccde4d 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,6 +3,6 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
-EBUILD openrc-0.42.1.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
+EBUILD openrc-0.42.1.ebuild 5353 BLAKE2B db745d158268ba13aecfc2506b02fa86cbdfda9dbdd1449cef2702b6809c18ac9651622ab26eb495280840f99ce67485c7ff631da500f267c18d166cad89bf00 SHA512 d4ae76f87661cb3a8a4423c7ef9c1aed75e094936df090c9a73e029f8f92153510a68e6cf9d8bebc8d76d875d22ca452b898b114747f1236f5a933039fec3e67
 EBUILD openrc-9999.ebuild 5025 BLAKE2B 1d41d1b9f89a5d84a80728f01be9f18b7506fd008bc00e096f9c70493434796429b8360e94532ec8adc99b3f7ca6016bb63f7fdbb25ceda95cd7e6a94113dc0f SHA512 74c80635d4760fc100065e64c826650d8047133ed92f9748e2dcebe4224d8cd1947d1b22739c50fde56bd0236aeef7aaeeefb31222605c170c435edf6d3aa8f1
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 3e6f63ea18b9..e62fc19041a2 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index bdfee28bdc54..c256660f98e2 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,7 +1,3 @@
-DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb1ed69bff02342617f3b64256120a93696965aa18ba6810b96b1746ed8db6d72db446a72caaf2c3ad850db9d4d4f260bd9 SHA512 6e2519eacb5b60449c968e53a4363966b42ca7c564fac7db7d982ceeecfa70ac0662dc6ea75a2d503a7fa74c8789e0fd1331cd8fd3d75fec5d2cd1a646896b3d
-DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891cccaeb53b9514cc2bf4ad4bac1e8ee38ebeb61678ee886389f837c9f578f1df93ed94f8492165e1613d1bb60b246ea5c52428 SHA512 e488db70b85ba8d5abadf6c50a772f7cd338405c9465189a70eb0da1b488434cd234118f44933847cd05406f55831d08db767932794798270be5964fa4c3dc1e
 DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
-EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2
-EBUILD osinfo-db-tools-1.3.0.ebuild 856 BLAKE2B f88cce749dcb0a174a2ccb44bccf87288c8d1312355cad4cf966fb0222a7a66fa4deea2182a650050a41f30883420ae72f6e36441c5eaff800763dc8e7fa6aa6 SHA512 6564edefd5f04a60a1c2cd4e1684117155c271843bd1c0e002cebe636cf8a004eb9bdc1cb3cc156989dfe482b0d5c1970f3efa807ddc10734c8f2f923b03cd94
 EBUILD osinfo-db-tools-1.4.0.ebuild 856 BLAKE2B 038ba8148b42ea03985e3f898b791876a87b30080f369f228d61d74f65a0f013bc2c9b321f2b12357c2a4d4140a6aa11270019d1f9bdb3ec892dd62732a774ec SHA512 17aacd592fd949ffec601cf416b3f07fcc3562b6cb1ad5562cefa94b861959364f72da470133defe109c4aaca3f0dd497479339511933affb9ccd3ecb201e6fa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild
deleted file mode 100644
index 7f822d76ddc3..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Blocker on old libosinfo as osinfo-db-validate was part of it before
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6.0
-	>=app-arch/libarchive-3.0.0:=
-	!<sys-libs/libosinfo-1.0.0
-"
-# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
-# libxslt is checked for in configure.ac, but never used in 1.1.0
-DEPEND="${RDEPEND}
-	>=dev-libs/libxslt-1.0.0
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0
-	dev-lang/perl
-"
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
deleted file mode 100644
index 0850c1e52e71..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Blocker on old libosinfo as osinfo-db-validate was part of it before
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6.0
-	>=app-arch/libarchive-3.0.0:=
-	dev-libs/json-glib
-	!<sys-libs/libosinfo-1.0.0
-"
-# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
-# libxslt is checked for in configure.ac, but never used in 1.1.0
-DEPEND="${RDEPEND}
-	>=dev-libs/libxslt-1.0.0
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0
-	dev-lang/perl
-"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 8582f3e31292..3c8963e573d2 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,5 @@
 DIST osinfo-db-20190218.tar.xz 82712 BLAKE2B d026b428171127b5048357ae75e2601fc184b9e2e5dd7224a7ba1a439ebf20e567bd910ab4b8a0920d3f8c0e2e8be637086920ab905a8fd8eb98c772a13c234d SHA512 e6b6f0e8b965ecf5a6c38071f3b2d5646123a6d84a5d5ebfb59995f10ae0aa8985bc5caeb1a4de396b92be0466291bc82247f33138f7954c847651eb682fdad3
-DIST osinfo-db-20190304.tar.xz 83024 BLAKE2B a0ad9a24f7dd07dc672b2106bf9f767456bc64f0500cb713257eefaa45f1b1a15b1116f0ac6611966ee6750ff519da8d71c746c930ef5e3c5ca54780d247eed8 SHA512 b8a2911da9d84682423ffaf257ffc9e97bc0abf835d6d5929e7e544167a86ca85b882f549e692c1919a49d79815dc32ae86cee99284c7a1c7b9a55de72368ccd
 DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
 EBUILD osinfo-db-20190218.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
-EBUILD osinfo-db-20190304.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
 EBUILD osinfo-db-20190319.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20190304.ebuild b/sys-apps/osinfo-db/osinfo-db-20190304.ebuild
deleted file mode 100644
index 063c9afbf192..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20190304.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index 42be8a87c232..d18e56f7cbc2 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,4 +1,4 @@
 AUX pacman-5.0.2-CVE-2016-5434.patch 3938 BLAKE2B 67ef2e348502753df10f7dbc9235401dcc8fe1e304a718592fafb6e84e7e045635890aeffe5ab808808f02392c6a141add8d97370957cef8fce357c8dd17b90b SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30
 DIST pacman-5.0.2.tar.gz 3361701 BLAKE2B 499041cb9914991c12c21383aaf36465189ced456ca8b2908d3c036acc3ef9dde0fba1efd823580c12e6d8dbdcaa5e53a7b1329cac347208d1de21702e8f3efa SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628
-EBUILD pacman-5.0.2-r2.ebuild 2892 BLAKE2B cfd40c949162e4cbee77e82a9fb36e9628c5b1ab807c67635422dd65c6b3be1b22809ceef17122d323f644a6c796b06388fdae0bc1e96b8e5cc135fd8902ca84 SHA512 69cbd3d0b71674a47868c9891ca66cac5a03c40d0959f6d84f302bcf14ae12125197e568a71c4aa2f473e97210c4039eecc57f1ee8f41bd6c1063ed7217a8bfb
+EBUILD pacman-5.0.2-r2.ebuild 2890 BLAKE2B 3f00cc60a36af6b6b4529dd19dc4f31951736bcf9b9db09d119373df2fec73cac515e9f8e867d1e170961f22f01a85a2c6f5f4e7d0a617052430fc21af0a0a0f SHA512 2f05d4cadabb3a37711d94465b9031d441158ca563724e65e2641f986193492bef5012b47997bb3b5b08874ef357157196e20c57cbb4bf0ad78238497405b032
 MISC metadata.xml 675 BLAKE2B 4019b589f7cc08897c958654944004864bebf838e50d32fa18b295ecbf99d137431402dffbda17b9578f3b0c005e46ef0295d8edc73f01f840d5822c478595fc SHA512 52987ad9ce090732316a0fde96b26cfe3a21cdf1f4ba7b4dc661d21568d22a8972e8dbd90afd7a183fca64a13051c2723f2732fafc56413dfeb156fa7d7d0886
diff --git a/sys-apps/pacman/pacman-5.0.2-r2.ebuild b/sys-apps/pacman/pacman-5.0.2-r2.ebuild
index 37ec0a9e7aaf..59c237525513 100644
--- a/sys-apps/pacman/pacman-5.0.2-r2.ebuild
+++ b/sys-apps/pacman/pacman-5.0.2-r2.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=7
@@ -108,7 +108,7 @@ pkg_postinst() {
 	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
 	einfo "to avoid breaking Gentoo systems due to oscitancy."
 	einfo "If you prefer another directory, take a look at"
-	einfo "pacman’s parameter -r|--root)."
+	einfo "pacman's parameter -r|--root)."
 	einfo ""
 	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
 	einfo "Please generate it manually according to the Archlinux documentation:"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 0f3204498473..39a9a8075824 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,7 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-EBUILD pciutils-3.5.6-r1.ebuild 2854 BLAKE2B d96a08a80119e3e6bf4d6843caefb93f28eabb0beb3592c2d7f97daaab3ee6dba0073e0091a1dc31b041072d9391f2dc037a5b565fc04466908893824d913526 SHA512 e70ad126a79e3a64209ec3b9bfc0cda2447e215d9ed21820abd44e016c0b9e135d851b3043b355ed117396220579199fcef6616f76fe20f61644ab31ed0eca6a
-EBUILD pciutils-3.6.1.ebuild 2867 BLAKE2B ac59c857cfc9ad25ec8698103d1db486fd5911a4193698f3524a745317cbea46c0935ca0576ad77e2279846028b0253127819e941bcb89c39b1a5cbfbef0c747 SHA512 ada3889c542b632339dd6a4b074ec72efb6db84f89caf4ba3fa57ea365cc401e3946e1601cf746b1d4170811dcf3e520fd9cb4949e446561594b5204de1e18c4
-EBUILD pciutils-3.6.2-r1.ebuild 2867 BLAKE2B ac59c857cfc9ad25ec8698103d1db486fd5911a4193698f3524a745317cbea46c0935ca0576ad77e2279846028b0253127819e941bcb89c39b1a5cbfbef0c747 SHA512 ada3889c542b632339dd6a4b074ec72efb6db84f89caf4ba3fa57ea365cc401e3946e1601cf746b1d4170811dcf3e520fd9cb4949e446561594b5204de1e18c4
+EBUILD pciutils-3.5.6-r1.ebuild 2870 BLAKE2B dda0660cdc472262389796e4ced29491050bade11e6bdf86ecb92088ff731aefeeaa2e95cfc37ae864eca1de5627831290423b5c92fb0436242b2cf855db9a13 SHA512 34454feabb024f8497ed9bd817f3d8c4616005f04ccfc0bb2546e998ab237f598771607b892af0696f1b521e42b8b87f80a442441b3f54a7090d283759208994
+EBUILD pciutils-3.6.1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
+EBUILD pciutils-3.6.2-r1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 6f9475350b3e..972c45769c03 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
 		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
 		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
 	fi
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
index 2a1f547edb39..587b417565ab 100644
--- a/sys-apps/pciutils/pciutils-3.6.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
 		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
 		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
 	fi
diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 2a1f547edb39..587b417565ab 100644
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
 		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
 		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
 	fi
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index c3456e2300f8..f346037b92d0 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -3,9 +3,8 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa0
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
-DIST pcsc-lite-1.8.24.tar.bz2 755670 BLAKE2B 22cc072978e221d455373e1fdeb21ae8f3dacdd188a4e8a69ef44202924e6c17c4282d424c88ac32b04c62af6e67787f2d2ba936bd3e3667452b32c40254de28 SHA512 df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
-EBUILD pcsc-lite-1.8.24.ebuild 3143 BLAKE2B c8ef25ce037c708a6907b6576bd445221acb5649c480627d2b0b0986b3982970a2e6248bcc96895bf68582e41e7a0c4d0b3f39e8872822df9e7439db04de690f SHA512 9acabc5a46749c7e629f50d45acf32d587a6e493af63d9c91231c0588c9d944d9292425d20f6915669f2102d4ef9be277bef33f3ca4ea8bd95290adae78569bd
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3270 BLAKE2B c6f56b504f160d33ed088eafcb5bb1e1fc7a0fc14d6e0ab9059f1e5e5f9beb4be9957292ca7d6d89c3ccb2408459d6e7963f32e8b1cbd247c8a264f7f4c003dd SHA512 b53adb0a3249442eaa96b725fa836c969072e913cd04db3dd3110a361084ef3a58741f4b5f3156872ec2ddef3add4f3bed93b1c37c2f6b4bfc2ce38aa578e1ca
-EBUILD pcsc-lite-1.8.25.ebuild 3157 BLAKE2B 6acae101029143740b7f89583039e2c9055e297969b654b7085dcc79daa5d9e5a9512b59bdb649f9998782d62b4c8207c0b9561042f38fba675091544e0c7bff SHA512 da22534015b24d6bd9c84e42231648417e18ca43c87ea1e4a60037a214947a3132afaf42714b3af978db9b361bd6835ebaafa1855cc9d25417a8f0055ffa8023
-MISC metadata.xml 1193 BLAKE2B f842dcec2896ec10e4534bff193a9fce613e935c67fed485ff4d93641379b01160315a001a60c052fdce8895340a64e2d47d97d70947bae367e4e8ba249a49a8 SHA512 c3aceb88116b636691dcdda75b9b82b3e597f2988d4cf9d53ef907b765993f0bb1c2510fd1a9deda10d0ad9c24adbc7d3e95d310b25dde398f3e7de92378120c
+DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3034 BLAKE2B 942d27c6d1fc62515cb0d06c3305b80b927fd7a1bbb0deba55f5ca62ac2be8a4619befad2774534d6901b1b0f46635d8dd8a6166f7b2c0e8abede2d0d8fb844a SHA512 9d010856526b1e61b14793be62e70833cab0f31ed2b266cfc43c638203016e34f5c7288f25d210ee40334042506c43bddd30a1f97473aeb3b37255e83eb3d7c5
+EBUILD pcsc-lite-1.8.26.ebuild 3137 BLAKE2B d8c9cb8de8e16aaafdf88168a8649d6b97be7ac45fd8cb53257376b89305281971deb01459e99d20120358750af8deb9e325573403ef0b9d95c6fdd22d7bd257 SHA512 2d102477741164e9258b45a44513bbca59ee6fc8a9aa4df8c5fcbd6229d10233ff51c7da4079b334f5b98e98214a8f412acae47b5ebdb6302a1ad30ad644c737
+MISC metadata.xml 1172 BLAKE2B 4812ad5a9e6f621bbb49e4411893118e05d2c2f091852c8e883a0b016df95b5949bf03a56f219d62fd88bf4a577a167bafc5c8e87e2d38d83f06949cad935f35 SHA512 4c1cc89e8a1c2547c601bce8523a0adecc24403f5348a96a8760e178bc1fe93dc36b7b55d4ddfa541cdcbf4eabf8e2ccb1ce6092b42a80d20112c514b9ad1e41
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 168fb01b4353..293526049b68 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-</maintainer>
 <maintainer type="person">
         <email>zlogene@gentoo.org</email>
         <name>Mikle Kolyada</name>
@@ -14,6 +10,7 @@
   </longdescription>
 
   <use>
+    <flag name="embedded">limit RAM and CPU ressources by disabling features</flag>
     <flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
       Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
       smartcard readers. This flag should only be enabled if you're
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
deleted file mode 100644
index 93765f85c0f2..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit python-single-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="python libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) \
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable systemd  libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 87907e6517d5..602e0cb56e08 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit python-single-r1 systemd udev user multilib-minimal
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 systemd udev multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
 
 SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 
@@ -15,27 +16,28 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="python libusb policykit selinux systemd +udev"
+IUSE="libusb policykit selinux systemd +udev"
 
-REQUIRED_USE="^^ ( udev libusb )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
 	udev? ( virtual/udev )
 	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
 RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
 	selinux? ( sec-policy/selinux-pcscd )"
+
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -45,10 +47,7 @@ PATCHES=(
 DOCS=( AUTHORS HELP README SECURITY ChangeLog )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
+	python-single-r1_pkg_setup
 }
 
 multilib_src_configure() {
@@ -76,13 +75,7 @@ multilib_src_install_all() {
 		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
 	fi
 
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}" || die
-		fi
-	done
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index 77ffad5c2320..e962566ef384 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit python-single-r1 systemd udev user multilib-minimal
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 systemd udev multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
 
 SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 
@@ -20,22 +21,23 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~spa
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="python libusb policykit selinux systemd +udev"
+IUSE="doc embedded libusb policykit selinux systemd +udev"
 
-REQUIRED_USE="^^ ( udev libusb )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
 	udev? ( virtual/udev )
 	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
 RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
 	selinux? ( sec-policy/selinux-pcscd )"
+
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -45,10 +47,7 @@ PATCHES=(
 DOCS=( AUTHORS HELP README SECURITY ChangeLog )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
+	python-single-r1_pkg_setup
 }
 
 multilib_src_configure() {
@@ -57,6 +56,8 @@ multilib_src_configure() {
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
 		--enable-ipcdir=/run/pcscd \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc documentation) \
+		$(multilib_native_use_enable embedded) \
 		$(multilib_native_use_enable systemd  libsystemd) \
 		$(multilib_native_use_enable udev libudev) \
 		$(multilib_native_use_enable libusb) \
@@ -69,17 +70,14 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
 
 	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
 		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
 	fi
 
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}" || die
-		fi
-	done
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
 }
 
 pkg_postinst() {
@@ -95,9 +93,9 @@ pkg_postinst() {
 	elog "EXTRA_OPTS variable."
 	elog ""
 	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
+		elog "Hotplug support is provided by udev rules."
+		elog "When using OpenRC you additionally need to tell it to hotplug"
+		elog "pcscd by setting this variable in /etc/rc.conf:"
 		elog ""
 		elog "    rc_hotplug=\"pcscd\""
 	fi
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest
index acd5bcb8bd9e..3f89ad14f102 100644
--- a/sys-apps/pcsc-slb-rf72-drv/Manifest
+++ b/sys-apps/pcsc-slb-rf72-drv/Manifest
@@ -2,4 +2,4 @@ AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 1211 BLAKE2B bc4e93838809a3782d3a7dd8ce
 AUX reader.conf 275 BLAKE2B f59922513d20a8b79e8c74a2cd55523b7ac488f76da5932971670060f78e1ff6613ef5c6bed64ea80c4b9514d3034de3ac4f83782bc46d1e2dea71ecdc523c98 SHA512 8c7de2c3504b23ec27b3437e1b321a23dd87db9fef51ead002a8c5b3c569e713e36cebe06a40071c95508568712f10f3b42609d6adb6254f63acf8ecef79f32e
 DIST slb_rf72-drv-1.1.0.tar.gz 53110 BLAKE2B f5ff955ca7dda46d792a0595de8ede4559926014874a1b79183e3a7a311e79784d98bee71f45d701f18fafcc561669eced8b090ad1a0d38c5102ecec92f59ba1 SHA512 93fd5dc9e38d89a0ae3f8c5adcdf2b4cefd8caabf7cac0e0551795b8b4190031ae7c7e30962dc90c6e8c5fcec6db99d4d14f00b8a7787ec043e366ef344ebd9e
 EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1525 BLAKE2B 77154d9e707358ce7ae67fec759713598fc845e64d3487b9a370221551801dcce2a4d60c730421fcad0198b58002b78fba57072ca7d3d9bc30f99d5a4be16e66 SHA512 c4124ad466e6047eb285bbea643754f74807c2e9910e65e593812644a5078cca490aa29f6bd275a3577acc1c43d93da61a330db12896b0a5ef0c7bc376f13ac7
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/pcsc-slb-rf72-drv/metadata.xml b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/sys-apps/pcsc-slb-rf72-drv/metadata.xml
+++ b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 36641b533c63..4ac3d574bed2 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,4 +1,6 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
 DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793acf2979f2410c92857cce7483ebbb59db07657bc27be6d5a799f7f85da45782c4f1a9bbf7c450b43d533dce54755e7 SHA512 da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0
-EBUILD pcsc-tools-1.5.3.ebuild 1336 BLAKE2B fe07dace5b90ceb41a558c203ca11c05b17170dd439980bf8def4a4a243eacc00df56ea8a1dae0538175d240adbfe65b09581c7531aab9e25993e717aef73350 SHA512 d1b36fc8b0a79ce95f0854beb7dd1e0354ae5e30010d7dafe12a9d657d1480028bae6864b4390a54a70c9dd4c26c072e3ca3f531fd903e955d29b0a1b52d716a
-MISC metadata.xml 470 BLAKE2B b07602c76c26d4dd8468930997a52e1768a1e45aa5294a7e27995c9129f700b658a2b8afd5b73829b21620e6349cc04505a54c37166d2078a1ed250f172c2bcb SHA512 bd45fbe04b4a3e8b1501d3807f879dc1982288a10d4d209d01690e2ad1a2fbb8a475721961835717a2925e127e26135639bf6bb1f35e147595f9e8e619481079
+DIST pcsc-tools-1.5.5.tar.bz2 287752 BLAKE2B dd0563f75c2b1cd05f21916287ff98c8b5f0c444b71ac7cda4da3a9dbf2db58f92555d54029a73feffd651b42ccae820670df1a90c8541eab188bf66b51ad114 SHA512 b34eaea663274e03790e409909ddb9819b20882795af2618068f59532e2f79973b22b4d0c468a0bb4338c74d1ceca310e8c60005fb1d15ab4f34053125ece3bf
+EBUILD pcsc-tools-1.5.3.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
+EBUILD pcsc-tools-1.5.5.ebuild 1336 BLAKE2B 575bb3247d69c2c6f6ae2e60a357c0df38b9b0d7e2ec28fd1706b0fc15483ed82cbe6094c67ad51a2c611d2a8fd7ceac01524168fb5d62076f6be11006ef2595 SHA512 69d537562db9dd93ff01ea5300422337270496f1e853ccd5e8741fcab0540286d001021c7fa2bb51cc14d226371b5b5f132313c3121d3013348cdf38f61c68c9
+MISC metadata.xml 477 BLAKE2B d1b0b543832a4df3f555e48309688d11ee9869b890b0fe097274060ece943c8039310756c71e0829fa156ac8c5a58b85ba731370be03570b6269df8c6e1a9bbe SHA512 2805d6a9ab769a0e9333a9a7c81c76e977a08ceee40a73cbfb157135f72fd155feebdeeab20b5eaae7609370f4d3244990a9df0e9bc8a775018bc3eeba84b4b6
diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml
index 36fdbc824dde..aaa5942495dc 100644
--- a/sys-apps/pcsc-tools/metadata.xml
+++ b/sys-apps/pcsc-tools/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
+  <maintainer type="person">
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
   </maintainer>
   <longdescription>User tools for PC/SC SmartCard access (including pcsc_scan and the gscriptor GUI).</longdescription>
 
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
index 490d6c2f740d..add6360afa55 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
new file mode 100644
index 000000000000..aae8a0221d7e
--- /dev/null
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="PC/SC Architecture smartcard tools"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="gtk network-cron"
+
+DEPEND=">=sys-apps/pcsc-lite-1.4.14"
+RDEPEND="${DEPEND}
+	dev-perl/pcsc-perl
+	gtk? ( dev-perl/Gtk2 )"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(
+	README Changelog
+)
+
+src_compile() {
+	# explicitly only build the pcsc_scan application, or the man
+	# pages will be gzipped first, and then unpacked.
+	emake pcsc_scan CC=$(tc-getCC)
+}
+
+src_install() {
+	einstalldocs
+
+	# install manually, makes it much easier since the Makefile
+	# requires fiddling with
+	dobin ATR_analysis scriptor pcsc_scan
+	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p
+
+	if use gtk; then
+		domenu gscriptor.desktop
+		dobin gscriptor
+		doman gscriptor.1p
+	fi
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/smartcard.cron update-smartcard_list
+	fi
+
+	insinto /usr/share/pcsc
+	doins smartcard_list.txt
+}
+
+pkg_postinst() {
+	use gtk && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f4426f676299..42b8e479206a 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.10.7.tar.gz 645474 BLAKE2B 3c311967cd2b4e29a45fbf4f2af9207c20f2401780fc3991c726917d103d6e59e951172280c212c7dd46db33defbfd6aad1a55da4d02484b8963ab8049b86c6a SHA512 91910c9b7ec02396e1e0ff2a23a18757749fea635e3e294131d736eeee8d67bd58e9b5f1de7440e50d926291dd3ed36dc7381a29f7ac9b58c27cf4f3fc49ee45
-DIST pkgcore-0.10.8.tar.gz 643637 BLAKE2B 191f0c0bfcc0eb6b684001ba4c06393f6010ad2171b0be695c1aceeae3973717c7bc59bb5848d85797508fdbac5645cac228df7d6b9bc9aebcc98ca69243e533 SHA512 607b921b05c833a0c199abbfc4a4afe282935dc6e67904f9cc0588bdd4b2e872c1cffa5ebf0e6aad04912b362c67dc2b29794c3be5410dd019797b447a0ed3d5
-EBUILD pkgcore-0.10.7.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
-EBUILD pkgcore-0.10.8.ebuild 1765 BLAKE2B 9267ff91ad85183fcf1995ac992274fa973e5af3e4d1ab0a5ca23cabb75d46961077efc681e04608e906a6d4347f21d1bd8033c7735875cb4d95dd92ae79bf04 SHA512 fc19ae2dcd82b8bce61deec015d30ee1f1e568c0904da57563cde371d507b68271093e118205ccd2e3264b0038325013074cc24a1aa3b38d113d214eb2df5313
-EBUILD pkgcore-9999.ebuild 1072 BLAKE2B f814ecdc97009cdeb305f0cbeb8e4e2103bc4be665c8af78831fc765a3c2c36a8ac48ae2c0e26b4d3779df1191fde759e6f02f79dc7f180fca150eb530c6f5a6 SHA512 60586c9c8c6cd46eb47ba294fcc501dbdcbab67cf70c6debdf0420eaccfff6d59c6cbbd53c9246f54163b02c94d910523b5763de32f5a3d46d415cc6e326064c
-MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
+DIST pkgcore-0.10.9.tar.gz 647634 BLAKE2B e05b091d9ea797fe4207eb750edabf98faa3574b9ee93799554ed525cab5513b5cf45d9f2757c1ba27a3e7add4c55cd51ee57a650d988916e2bc6d03bb78f91d SHA512 efa9e43f2a67e934b7dded190f93f09b860b770097e3715b7f03af3213fc680f5b9d5d9d14c5671d0ef2df9cf0144a009f7fd20e2f28d5c2dcdc685c65bf7232
+EBUILD pkgcore-0.10.9.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
+EBUILD pkgcore-9999.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
+MISC metadata.xml 336 BLAKE2B 1dde157c2023dcc7578651078f6e9ef30ac5eb28bd5edb690a29b329307c3435b4f1cd51288c1661f58362f57c5de7267e497c548c32fd5defbca85f0ec6d7cc SHA512 a48569920d2907935e8cdfb28b2e2d5fa2bd791eef4fa2ec59c0a22caf322c05cc2c68574ce928890e0de873d69e9e62adb2efe82704556ac6ebef82ef6fc876
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index eed40afb00f9..98b0e74b0c93 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -5,9 +5,6 @@
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
-  <use>
-    <flag name="doc">Build and install API docs.</flag>
-  </use>
   <upstream>
     <remote-id type="github">pkgcore/pkgcore</remote-id>
   </upstream>
diff --git a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
deleted file mode 100644
index 7351db9305d0..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( $(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/snakeoil[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	!doc? (
-		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_check_deps() {
-	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
-	has_version "dev-python/snakeoil[${PYTHON_USEDEP}]" || return 1
-	if use doc; then
-		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-	fi
-}
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.7.ebuild b/sys-apps/pkgcore/pkgcore-0.10.9.ebuild
index 670df92a2cf7..a4a26e422fe7 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.7.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,35 +19,26 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_compile_all() {
-	local esetup_args=( $(usex doc "--enable-html-docs" "") )
-	# only build man pages for live ebuilds if doc USE flag is enabled
-	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
-	esetup.py build "${esetup_args[@]}"
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 09021519bb70..a4a26e422fe7 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 3d44f2201b30..28a20b693e4a 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,6 +1,6 @@
-AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 BLAKE2B cebe20a80f929f1104fc8a9e54845c31cb21f5aa9d4f404b4469fd006884239504b0c9fb5cd1db579c9669632cafd40f0186d1d8f125c39d46c68af1f7084713 SHA512 a606b937a39c558fa5c48544fa3451504d3c8f540de97d87630e0d3edd6a984b74d8c52fda189aef818e007820ee146daf6b3ce75aad03b3e8e4309723f5113c
-AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf461200a980149b417022dd0fb78cd1f366be2001850956fede8677859a952c9b961668488f8bb2ef0302816f72e41f71b0191d3b336 SHA512 9009544a6d424dc6449d8f1ba53521802741b904129e1f4cd729a1051735fda3d6fcfe85d5aa49f6fbc5df62abbcb21fd7ab578cee667efaf3e4c00dc1b8131c
+AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f5666886b9c192e0f530b3a3785c8a64fbfbdbbbc93331a9c74cbc19cab25ebcc0f5e3fb64d23348f1dd8deaf028545d444000a64d6a5b45a SHA512 3bc940550f59d62106c610d7846ddea09cab674b176cd7361848d283b0f19a0fda5573c6bafb99abe99c806651493ed07ac21f92d32f7dc30d0ccb77a4c1928e
+AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2025 BLAKE2B ef52d2965725324a5b98db6c6b8a2c061396f35b53f30dc5224d5d56fe8325811357c1de2be0518b5944a4dc3971e791c6fdc60f4d3ddc82876ad94dd2bff6f4 SHA512 65d58a6044be597ac0fe9fe893b411d8f8d82f0ead2eebb710c07e5ce582c673b321283ff01e330f679233fbb2e693576e1a64c79e34d2867873f034bfb089d7
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2014 BLAKE2B 6f03f1ff6df2592923efa868008c734225e2bfb07ce01fa2173fc9fd56886be96760e13b30d1647dc5e0ced80a46ad160facfee7a3ae0eeee5f8bc2b04f78310 SHA512 40168c4e6c9c75f9004cdd97b0dc9227be44bd426e6cc08dfc2ce4bff8decc5f4c952a8e787bd948d392731a8ec09b2fef6563a8d151ecd97fe9338e613ee09d
 MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
index 93d0555f0f3d..319a1d6f04a3 100644
--- a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
+++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
@@ -16,21 +16,21 @@ diff --git a/tests/check_fstab/a b/tests/check_fstab/a
 new file mode 100644
 index 0000000..d16d1c5
 --- /dev/null
-+++ tests/check_fstab/a
++++ b/tests/check_fstab/a
 @@ -0,0 +1 @@
 +This file is a 'dummy device file' for the fstab check
 diff --git a/tests/check_fstab/d b/tests/check_fstab/d
 new file mode 100644
 index 0000000..d16d1c5
 --- /dev/null
-+++ tests/check_fstab/d
++++ b/tests/check_fstab/d
 @@ -0,0 +1 @@
 +This file is a 'dummy device file' for the fstab check
 diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab
 new file mode 100644
 index 0000000..8ba6f6c
 --- /dev/null
-+++ tests/check_fstab/fstab
++++ b/tests/check_fstab/fstab
 @@ -0,0 +1,6 @@
 +# A dummy fstab file for 
 +
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
index c96fc0554522..3dabd03c9659 100644
--- a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/416985
 
---- src/conffile.c
-+++ src/conffile.c
+--- a/src/conffile.c
++++ b/src/conffile.c
 @@ -372,7 +372,7 @@ static int cf_prepare_regexps()
    /* A regexp matching a boolean value*/
  
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 52df8b15b9ff..7df482af2a2e 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils bash-completion-r1
+EAPI=7
+inherit bash-completion-r1
 
 DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
 HOMEPAGE="https://launchpad.net/pmount"
 SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,21 +22,22 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
-S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
+	"${FILESDIR}"/${P}-locale-regex.patch
+)
 
 src_prepare() {
 	# Restore default value from pmount <= 0.9.23 wrt #393633
 	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
 
-	cat <<-EOF > po/POTFILES.skip
+	cat <<-EOF > po/POTFILES.skip || die
 	src/conffile.c
 	src/configuration.c
 	src/loop.c
 	EOF
 
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch \
-		"${FILESDIR}"/${P}-locale-regex.patch
+	default
 }
 
 src_configure() {
@@ -45,14 +47,15 @@ src_configure() {
 src_test() {
 	local testdir=${S}/tests/check_fstab
 
-	ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \
-		ln -s $testdir/c $testdir/e \
-		|| die "Unable to create fake symlinks required for testsuite"
+	ln -s a "${testdir}/b" &&
+		ln -s d "${testdir}/c" &&
+		ln -s c "${testdir}/e" ||
+		die "Unable to create fake symlinks required for testsuite"
 
 	emake check
 }
 
-src_install () {
+src_install() {
 	# Must be run SETUID+SETGID, bug #250106
 	exeinto /usr/bin
 	exeopts -m 6710 -g plugdev
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 3ec2863a3302..375a82ad7b77 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,7 +2,7 @@ AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3
 DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
 DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B 6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462 SHA512 d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
-EBUILD policycoreutils-2.9.ebuild 4845 BLAKE2B 1f8e54dcd6f27e41eefa74c6e1a49f5decb96a6c60188abd45723100cbc9aef819c1c18f7af128425b039cc3c75126f1625a940654ca4b1c8801d44fdc8f5f4e SHA512 49f7e7f03b004b303860831b80d89f1d6348a331f63ef564a15d21ef1ebf0fb1971a7f577649311c1216a223b618e16a002812f0adde340583d15f74951f7f7b
-EBUILD policycoreutils-3.0.ebuild 4747 BLAKE2B a41a836f4ce4be833f9f17b0cf7c4b6f34044715ade2539051c1399f63c0deac1cf93b177b03db7c924bbf53b88a7aee19b471b421b6134c12503acf37db720d SHA512 39029289d4b1d76a64947bd0d164b13dd48e17da41086b3753de6d1483076ae8cce522fe22196bae14efc92647040f79f4c573fbe3b55196dee43ffedd56aa95
-EBUILD policycoreutils-9999.ebuild 4747 BLAKE2B a41a836f4ce4be833f9f17b0cf7c4b6f34044715ade2539051c1399f63c0deac1cf93b177b03db7c924bbf53b88a7aee19b471b421b6134c12503acf37db720d SHA512 39029289d4b1d76a64947bd0d164b13dd48e17da41086b3753de6d1483076ae8cce522fe22196bae14efc92647040f79f4c573fbe3b55196dee43ffedd56aa95
+EBUILD policycoreutils-2.9.ebuild 4872 BLAKE2B 719cd695da8f32790c1a45ae10059ccfb88145993feb7425f607511e5f7a58f30777f90d1b5ffaa59fbfb1a070de4dcbe0c3bbd24c88e5bc91519198b44c5ae8 SHA512 ca64aebeef0c5f2b515d73e08de6eb767bc07b3e4d60b01020af8457c36f5ce4dc5b838d499ad70552f8b472abcc94c40a013b475630de4291ac5af70b5fc80e
+EBUILD policycoreutils-3.0.ebuild 4752 BLAKE2B d4c931737d942b87da3b1904f2ca128086e3dbd3c7034fad271a77b1d18e89d588ecb590aa24c1700d84763d9d556bce3726460621829a02b0de9d3921cb0fd5 SHA512 f710f3c53d3cce5cd06e5ddd93d217116b3befbc370f89fa179a7fccc11286b9646f95743b52fa507eacaa5403acb32b169922dc75533f47a20d2ccbe69d7a4c
+EBUILD policycoreutils-9999.ebuild 4752 BLAKE2B d4c931737d942b87da3b1904f2ca128086e3dbd3c7034fad271a77b1d18e89d588ecb590aa24c1700d84763d9d556bce3726460621829a02b0de9d3921cb0fd5 SHA512 f710f3c53d3cce5cd06e5ddd93d217116b3befbc370f89fa179a7fccc11286b9646f95743b52fa507eacaa5403acb32b169922dc75533f47a20d2ccbe69d7a4c
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
index 6b80ee68ca73..39f49dc57c8f 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -15,7 +15,7 @@ SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
 
-IUSE="audit pam dbus"
+IUSE="audit dbus pam split-usr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -155,7 +155,8 @@ src_install() {
 	rm -fR "${D}/etc/rc.d" || die
 
 	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
 	bashcomp_alias setsebool getsebool
 
 	# location for policy definitions
diff --git a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
index 44d6a9a3dbe8..4cd4c8e967f2 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -15,7 +15,7 @@ SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
 
-IUSE="audit pam dbus"
+IUSE="audit dbus pam split-usr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -61,8 +61,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
 
 # pax-utils for scanelf used by rlpkg
 RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	!<sys-apps/openrc-0.14"
+	app-misc/pax-utils"
 
 PDEPEND="sys-apps/semodule-utils
 	sys-apps/selinux-python"
@@ -153,7 +152,8 @@ src_install() {
 	rm -fR "${D}/etc/rc.d" || die
 
 	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
 	bashcomp_alias setsebool getsebool
 
 	# location for policy definitions
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 44d6a9a3dbe8..4cd4c8e967f2 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -15,7 +15,7 @@ SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
 
-IUSE="audit pam dbus"
+IUSE="audit dbus pam split-usr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -61,8 +61,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
 
 # pax-utils for scanelf used by rlpkg
 RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	!<sys-apps/openrc-0.14"
+	app-misc/pax-utils"
 
 PDEPEND="sys-apps/semodule-utils
 	sys-apps/selinux-python"
@@ -153,7 +152,8 @@ src_install() {
 	rm -fR "${D}/etc/rc.d" || die
 
 	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
 	bashcomp_alias setsebool getsebool
 
 	# location for policy definitions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e08304ae1180..8832c1d2c6ea 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,10 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
-DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
 DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
-DIST portage-2.3.81.tar.bz2 1041978 BLAKE2B 03c032204dcc4725bfbf4d2bf605a8f2a24bfbd854d7c74e0697e25ae4e10831ec19e3c1252d2d1a5921cdf00801fbbc6fcf60a2d64076cee96f427e49b1ee37 SHA512 ce0688eab181243cf4e8dd2a7e2e5bc188e6323331ffcf8d6ee970073bc634bb5566afebef7570fff711ad1ae9a4484df9a602db523d3398ca6ad29d633f0824
+DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
 EBUILD portage-2.3.69.ebuild 8116 BLAKE2B 9f3cdde8658a1a2a79a40b3761caf628d01ccb31e5ea1362f51b2d3e94e94a500b266e956346da701632b725d9de71b8723f586cacab0eb807edabbe082148d8 SHA512 2de3f919fe7986557523fe7b1c0c48674ab971804fff1815d0506bc4b98990e336ac20a252ec7738205e8ea2e75ce0302b29b249d002657e15a3fe40fa42ffeb
-EBUILD portage-2.3.76-r1.ebuild 8632 BLAKE2B 4a6cbdab3f0a8e119e809ae382f1b6c87d5a76efcffeeaecafaf462f733c352ea1c71f14dc4eed390d8f4f2695641f2cf7249dbab11d17a15cbdb55b2ff3191b SHA512 74d1a8ab52e0684975a99923416a0546125d1f62534dd3a5fe823186841397f9347fc4dd94c7f63cac15c8abe7d504ec966a958a403f15b0f55ec3add0eb20e4
 EBUILD portage-2.3.79.ebuild 8705 BLAKE2B 7ac051695bf9baed4f6ddce870d09900e5951841261673250b0ffd2d60f1c4aee9864834af3ad11c392a92c92fb09d2295ed1ba5bbfd486a7d6323b75f2b52b0 SHA512 da2ce712f6dac53cba323ba4eef726a1a043ef181bfa61b26da88c33d49ea2c240728fd9ab14adec08520d6e096a536665496cda9a65da96d432ac8d20eef845
-EBUILD portage-2.3.81.ebuild 8716 BLAKE2B d7a399e135e7c258d43fcd2b33e682c3e7c48c8b9b9bc0805618d2e0bbfd502f314b72e893f8ae31f54939927e356c269e53c91c05df0e3fe18ba1d7b737f020 SHA512 98ac4f313d8477f444a22e8b13238f41b3753b148c33ec16ebe3a1e9fae7797e7e07638834e6860794d1ff079323a0cb81ce45cfb9fc596131c37468158f75c1
-EBUILD portage-9999.ebuild 7947 BLAKE2B ba9c171e912a3d1f89eb38fbcd11f5beea58f3d4ad4ede1f8ff4637c0e5275571320aede796689de7eab3148549158428abdc44473919d9c759a1ed9f70f6cc4 SHA512 ade3426cad5bb1edca686aaff9728e2f9f6279ea69f8694b34a83825894b369981a375cee9d9f5d10cb779daaebcc65d7895b0a909df53d17e9152fd8cafc107
+EBUILD portage-2.3.84-r1.ebuild 8916 BLAKE2B 079d87795c7a4de2d1d4e80f6f31c1c0055d33c64f24aa6e7370946fb4bb30c1db54cba0570a996657c2a115ab99217d5b1826dc14d8725169bc68123dc87c6a SHA512 a7f8f35bef6d45335ad93e4e850392303e8e0df80cb3b44ca998d2e265619be07509b085bd294066d9c9739351cbea5351c55bbc1fe038fc2bfe085608d1dbfd
+EBUILD portage-9999.ebuild 7969 BLAKE2B f3045bb8060ed1adb292c72f030f33027776a26bde78e8baca39f83720288bc592bbcf1d0fd13f49c52a55c9f92ca253108ed43d82b02d330158682b2d95c27c SHA512 d9d96777e19a8f3d35beb1f51a826bfa9f15f0c1d403f4284164e2c8a13eb6161a0320b22644569502c249a2d84bf675085cdff5567037df267915198e4f10b7
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.76-r1.ebuild b/sys-apps/portage/portage-2.3.76-r1.ebuild
deleted file mode 100644
index 28afff0ae724..000000000000
--- a/sys-apps/portage/portage-2.3.76-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# 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/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Apply 03c54e340073620f489ca85bca94267a198174fe,
-	# 0299aedef74e47c0a68acf7905d8714c9578f125, and
-	# 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046.
-	sed -e 's|rsync -avP|rsync -LtvP|' -i cnf/make.globals lib/portage/tests/util/test_getconfig.py || die
-	sed -e 's|if os.stat(download_path).st_size == 0:|mystat = os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or (stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \
-		-i lib/portage/package/ebuild/fetch.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> 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|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || 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.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.81.ebuild b/sys-apps/portage/portage-2.3.84-r1.ebuild
index a7197349654d..15f50027e29c 100644
--- a/sys-apps/portage/portage-2.3.81.ebuild
+++ b/sys-apps/portage/portage-2.3.84-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7 python3_8
+	pypy3
+	python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -26,7 +26,11 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+	epydoc? (
+		$(python_gen_cond_dep '
+			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
+		' 'python2*')
+	)"
 # 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
@@ -104,6 +108,9 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply 605ae9eb6dae230d8bb967edbdd719c61a2b14b8 for bug 704256.
+	sed -e 's|^		rsync ${rsync_opts} . "${repo_location%%/}"$|\t\tchmod 755 .\n\0|' -i bin/emerge-webrsync || die
+
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 04544afb66d4..e157a1cc9fab 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7 python3_8
+	pypy3
+	python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -26,7 +26,11 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+	epydoc? (
+		$(python_gen_cond_dep '
+			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
+		' 'python2*')
+	)"
 # 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
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index 455a373949fa..96236a85de5f 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,3 +1,3 @@
 DIST progress-0.13.tar.gz 57959 BLAKE2B 11d0dbcf6a4cdf96f3fa6b902d60c5ce0fa4a619c3b40db44d6ac3e05464876c054359399af8cbbfc5304849654e5decfbbecd449da2e5abfc0cf653c787151e SHA512 789e188e60137412f3ab0f47c82a969066eb1c312711982a4a77a28b1b334055a233b12d4840653a80ac6339e66f8c120e0312889369bbdc71fa10661e7c407e
-EBUILD progress-0.13.ebuild 614 BLAKE2B 60d2dc41439153274fcf1b06be00c21351751d5821bd42a91c41ef2305d4e992127af28d63c092db91da8a20f3868d65a83418bac4651cc3e56ff1abc93ad1e9 SHA512 8c3855fc8fffffb11fd4d2caa66e150f02827792cc7bd4efa247380e3d920df4d2df83e7a127000c4ac77a23155fab19e7a1116c6c3f03d373aac3732c102f28
+EBUILD progress-0.13.ebuild 638 BLAKE2B d9b3c897b80ae2d7febadc5753a9aae8f92a7f4bd58bc6f64f981a59b1644a26038dff632c5e6f41c9150ba811bccde7d66de03dc9d438c8f22829b7261f0152 SHA512 fc675aef805628c2a2682e965114beb62e6f147f8b9d03e48268534f509e5ff0aaf85982645c79f49665dc6ae185aa9b79bd7d76b6cd7772f75c0ede4851bbef
 MISC metadata.xml 335 BLAKE2B 720a8160043a20aa7d50e4fab61b6b55044c6a62b5baa848edf83f5954b824a3a3a21908e9e0712fae3773b122858eaa7b53a2aaf4365ecc500bc6e818ae327d SHA512 903ec46393a006768a24ebf7be7fed66b5ce5eb1db5c68f29feda30e9d79812ff4ca9303b2ad00def4ffe4e4f1f31e1faa6ef4bf868059459beb026331a3232b
diff --git a/sys-apps/progress/progress-0.13.ebuild b/sys-apps/progress/progress-0.13.ebuild
index c63203a9bfcc..5296283aa0cc 100644
--- a/sys-apps/progress/progress-0.13.ebuild
+++ b/sys-apps/progress/progress-0.13.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
 HOMEPAGE="https://github.com/Xfennec/progress"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index 3f0af5d034ec..ee7c4d4476b8 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -6,5 +6,5 @@ DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r4.ebuild 4034 BLAKE2B ad656aae0d318cf00b7a372207adeb05970c4bb148316cce7797eee80b9648dadc300d88c0e89449670cfd734dfaba6c969e5ce8875ec4d240cf8197b771fa51 SHA512 5f134f29dcb81ec7e60d6f85ae502061dfda765f76d6f8ae7969333a2f64013bb5ba6f9a42496e5cf3cc8824542185dca2c4ba76084b4cc19a71828fa9d0495a
+EBUILD qingy-1.0.0-r4.ebuild 4044 BLAKE2B 63ece0686d4cba32ce9772d5370c5e847cd6bf866a3bacdd51e941c6617ff5b6aad1a4b1e2423ddf5b26e3f17fa02345dd8f471673aaa52fc1c51cf40e8cbbe4 SHA512 8865f6a30c5bad554ae5399c58d0e18f5a0716583c9b2e40c501525200f1f56b405716b3d9058739f1f1e978359b1b8a252690f634ccf2f3095249abb88e4bf6
 MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 88a2eaffd690..5bdb362f4cc5 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
 	opensslcrypt? ( dev-libs/openssl:0= )
 	crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	pam? ( >=sys-libs/pam-0.75-r11 )
 	X? (
 		x11-libs/libX11:=
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index de2271479eba..b75a0a2276b4 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,5 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
-EBUILD razercfg-0.39-r1.ebuild 2107 BLAKE2B e2ffd6411790eb38f73398595d0627f5e4c9dc3ac3072eb963476fe41051356e536250551aaf6451c8d84099a1f42e77400d8f0d0c376608844930f3e52e07e8 SHA512 d2710c22cd9c0d8a00199a4993a998501fc2451bebc21104c7336887d27f5a01e3b4ca14c046c1490fd13bf745d59a769df863042f9c79107508da8889696a72
+EBUILD razercfg-0.39-r1.ebuild 2101 BLAKE2B b6eed30f4fe1c2d5755b56c5a40159d1c24b50a3d900e26ada7b4d5e5043f1cf127bb5fac7cdbf63dcbf6d1548957038db0285588df5a8b7aba2b7225a3e7a84 SHA512 20751b506d74ebeeff6254c22a7855c3ed6eae40c6a0fcf0b6d01c2c6112bd4a54d87369867c0ed6c4b5138679ed4ca76bdad04a7b48842a0724ee73dc2185ed
 MISC metadata.xml 805 BLAKE2B 6be95bde1f31d215ead8de0546bcae9860c5ea24109803d44dcb889e7b39aa21972813893da53ea0817a77f9158d18be4fccd166cb2fe8d82627411f25b1d975 SHA512 bf8d583f50967b6a2a77e3db46595286a717eef57e61bb3f8aa230c0b0fbc5fce265fc95bdb57c25b44564b22e8ac2940986a04f9c0f8a6d378e027612ab478d
diff --git a/sys-apps/razercfg/razercfg-0.39-r1.ebuild b/sys-apps/razercfg/razercfg-0.39-r1.ebuild
index c3b85d161675..a5023d502598 100644
--- a/sys-apps/razercfg/razercfg-0.39-r1.ebuild
+++ b/sys-apps/razercfg/razercfg-0.39-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1 systemd udev
 
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 283e916e5ef0..fceca97183a6 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,131 +1,68 @@
-DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST aho-corasick-0.7.4.crate 55480 BLAKE2B 61f8913da203106380d20f8ae4eab2bce453557ae5745522ec1647deb04c0173f96279aa64e3ebf4f8bcdb6f34a31a0f37345e4a4b7baad750971088b301760a SHA512 06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
-DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
-DIST bstr-0.1.2.crate 330601 BLAKE2B b477c2c7ff5a13dc1daa5d9ea3e6d9ba9e844cf2e055bfbfdee99d3310dcf9d12fcae36aa7b29601ca965d5ffb81d0d0a640c2f0e40f2edd33748bbb2f5eadf4 SHA512 93e57b17e06c9f67179e31338a7fd8f69ad7e807955d8483ac781208edf59339e89b8e11223d79b2b640a1679d61e2d4c7ca15ca6fab602b97b8558757f2899b
 DIST bstr-0.2.6.crate 336014 BLAKE2B cfb2eb6ecff2e0e18f26b05fc284cfb9db31f022984243b9d8fbb25d03371588a829a73cd312f0e54daae1f49216fcbd0193385ba7183a73b992a94b619a07b8 SHA512 e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4
 DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
-DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
-DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cc-1.0.38.crate 45503 BLAKE2B 19d8be59f639c200e43021eda8174dd2b6714d6a8756e1a87d01dc5d3876d11ceccdb5874cc0d2f94da3bba1b576f31409f660dd120a1ecdfe63adc6bff72dac SHA512 0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30
-DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
-DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
 DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 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.7.crate 21488 BLAKE2B 70bc3a4a4b4c624f5df8dd73954de3b77feb897406b7907f88357f6b4aec919fa72560e219933e744f909f3408478dd93f59cb28d53f7d608b7b6edc3204ad90 SHA512 e38e82ef3d3613e69e2ac38c63a16e6a4f0a7d54f8b894c45e1c9cb2b1d4f8d9a7bbf087c3561d5482fe45ecd51f3d4b2fdc61638df2c380e3c9c3d8fcc03eb3
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.3.crate 22348 BLAKE2B 1ebe2fa2a8f730526cfabf23d3fff8390bf6152d039eab03afaf98557de13da50b84e291820ad13e0efbce01c4b0389748329c63c3e2b6d5d804315b8d514d47 SHA512 255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c
-DIST grep-0.2.4.crate 3890 BLAKE2B d1d8ab33a8914e7ebd302ced46e24a79f3d1527ad8f549542dba1f45280c030ca493a0d242923545b6349493660bccaa14934bc820d05d3e823f3190bbac6a0c SHA512 c6983df9dcc268bc9835173189afc28ffec9dd234a0949389a40629e5644707b7c1b90025882c2580cc5f963fc4902070b191ecc6cacd602fa4c140ee8bdfbd1
-DIST grep-cli-0.1.2.crate 17012 BLAKE2B cd86ae2c715030c8a6e0188a6c408dc3e7a7fafa66c6dfd12c7073d4253d113f7a1bbd24066efe6cfb13aca21a9d302240c80dade186b6e61db19e52a472502e SHA512 1dcfd004cdddd02f4e77e96ca1d75009fb088b3b163c08a484b89d234e5262e655139f5f02c4471f9585e9655423eb7650f68c8ec7f6c316bf63b2e243bd3213
-DIST grep-matcher-0.1.2.crate 15521 BLAKE2B d68795e2369b621a9aa4dc0fd70c1ef2ce5cc19b83038f58173ce1fdd8b9459738da38877a7490e2bf150271297ff30d78ea34145ccf02691c54b538e122b03e SHA512 d948460d67f90a6cf289f2d704a3dab05f8005bcc24eb89266b03fc2b2c35f6aa81d73412302de8f48afc2562c8bbf3d0e5b94070bad2ebcc933b4eee8a91e3b
-DIST grep-pcre2-0.1.3.crate 7804 BLAKE2B 4dc462f9b527d6a0c6f3a0fd3ef396ddadea5e5ed87cbafc5d3169227e8d4dae3b48c955207d47633a3384e011868d0b97a1acb90bd6c1ac200f0e7e34c9afaa SHA512 49777885abbf028ac7845d76faf4d1f566d7551e71cdd9788bcc237f110d1f77fb438c42e965ec0b3b2943022acf0fd1b28f7b6e5ed3bf20525476eb9e9aa749
-DIST grep-printer-0.1.2.crate 43391 BLAKE2B d4690c3fdc0e5b518d2c4961dee160b939b9bef4be702555f9ecbbf8af5a68f62bf2e2b33f5e450e96f92cb0a93a3842adb9833ba89a141fe22c672e14df9e31 SHA512 a430f24e97e44c56c3faac2e49acb9ad96263614042f007252af944580726c38931f7fa272d0bc26d6d8b99bf47f9d55c3c3014210360f10290c16a6ee151a59
-DIST grep-regex-0.1.3.crate 26614 BLAKE2B 01976b0626b596516090cf1397a2ae3752fbd609efb4568fad6e6f61f1a0b0bbcf73cb213106a33ec4c4c6c3ded126fe5ea042460e34eeb9293e6e96adec2814 SHA512 9d84fbbd703653a671340d1ba812331841d1c446f00170bfbe7df7775b9eb398693dea19c55db4a7d0f69de226d7ab73866519a81dfaebb65867a6597891f4d4
-DIST grep-searcher-0.1.4.crate 42589 BLAKE2B 757398a8288e18ae67d7cb7d6f00f85b10fdf6992c055b2bfdbc4122c6d0962376eb29b1a4a8ca18dbe4b0b88e0f7bd2d2bb2695958394ec9efc077205ba8a22 SHA512 de61c95e66ec221005168bf0e855b800bccdef92c1c11153586d4577b286851534050b6976b14d45e3bcb12121085a5a1c4f71a057a3ed22a96b1de343609712
-DIST ignore-0.4.7.crate 46444 BLAKE2B 7809a535bc38a8e575fa5775545f913803442d21881a3db15ad82cc399b580942b93e8ac45c485fe4ca44b369eb57fa3f6150755338b58a721b6dcecb82ea594 SHA512 8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685
-DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
-DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
-DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
-DIST pcre2-0.2.0.crate 19322 BLAKE2B f5c8980788bb34c4874ec301df2a408fa144c4249583e59fafc5ea509834f9dd80bc6abc7f6a65ba9e480f2d9874686d710ba2bcf8053e75434ee6f7061e66fe SHA512 c8d6aa4e357c9b5cc7e8d527a0d0a605378f975f41fe0a5f4996175be1f620e8446bc7e6135927b50bf3687618671ca85bb2a67314b78989818efe30d25d3521
 DIST pcre2-0.2.1.crate 19394 BLAKE2B 49444b1cdae33b96bdb8bd40c94a7e57edfff0f733683ed7202d764df59952de4c3c70231caac87b6be63ad739dc615389486ee0ddfbe36c432dd3115a1fed1e SHA512 6e9a0d60c8bc633d4f19fbbb3934f86bd95e34dcfec8aad55dae5ebe4ed854dcb42ad265f4b0ed5c1a8683a032268bb38b2c3899d25428311cebf97789c62d0a
-DIST pcre2-sys-0.2.0.crate 2184217 BLAKE2B 1a82654b070e15563a1977097f30df0badd233844a7e0654117ceb9e6172f4ce1a50c057f6e6cc018729361ad64945ca648b5e19a0ac8f39215d64454cd8adf7 SHA512 23255712188fd517ca9cd0760c6da649006916b6e3b3295bc6078942706d622504da1b2b9c1199cd30208cc48aca08667b23941a357e4ac0f5fd20a1be3daeac
 DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
-DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
-DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_core-0.5.0.crate 19736 BLAKE2B cd0b6212ef01e703510ff0131c9745bf5da4f55d96e321f943527a39e57c8403d1b37bc790f6a09addaa85947f0c431a3001ff14beebe67193c5628d4270f393 SHA512 e98f9b93cf5a80c40c11e7e8faee351ef567ae7cf9db1b7789a61eea41d6509e83684da00284e6e3d0f52af08ce2a834339e652f1fd39d818a2827f6236f5d6a
-DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
-DIST rand_jitter-0.1.3.crate 18341 BLAKE2B 6bc99b148765ca0ad7ce1d457eaf4c039e825a7178fea200eded79a7897aa407ba39d9c8ab1693f28511fbf6def1bc9594e29ffe108555d3e1a3f709abb802e6 SHA512 a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
-DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-1.2.0.crate 245604 BLAKE2B 68951a1e686a4e7c1ba059e8d4c68bc44f59cf824d416d9430ca226c9bd52de42568a4ba041733a6f508711a94bf6f17fcf052683c2744885c98ca1c672ec0da SHA512 ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d
-DIST regex-automata-0.1.6.crate 92110 BLAKE2B c0ac8d3979c72be3c261a3e26c41fd04a4fa0c4e974a1cb4fac1857e74926b6f14734f14f65d43833b2f364c65de19504d6f9814213b81bd0f91fd41c49d5f50 SHA512 2e438167ef10459cb1f7ab7afe0297e3a93e34b8195d631206c804b4fc5498e03df243531df282928fb2b3bc4ab8dd0a15a101f9aa368c104fc24df190e85f14
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-syntax-0.6.10.crate 276985 BLAKE2B 6cf614eff1c3db35fb60f206c927cbd8caf4ec4942089c9356414b0239f3fa060859cfcf48e18184ad8f3a0aeac71193ba0878f3179653fa626dcb3d40de5206 SHA512 30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175
-DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST ripgrep-11.0.1.crate 236512 BLAKE2B dc6033e5acd8bafce9cccd7cda5fda4fe4e84aaf672d6a78873d522bba50d006b22d246d0f1c6742ebdc21a5a000fd556324c1fa956ab61691005aad34cd4269 SHA512 91a06a11e94cfd595ac1cc5ed6db481cff8b319de4fb09d1d29e800b60f75a4e696df75f97e0e29d53d7d68fc3fd7cebc5ae16b1329214fb1383d454fb2b0864
 DIST ripgrep-11.0.2.tar.gz 461565 BLAKE2B 5a9bcb423c470e99cd9e9299fcb9f2cb2f663ad1e3b406f1abc6671e68d876e8cda1866983d96fc498498e796c1f3af16838799741ce87b0d5b400e440ca741c SHA512 62b5bcceac2ca4899e797799e67a8e45730f1bcb5115b48e9ebfe12d3b0e43921020f368e4328b0f5060ccdf0dedb8935857ece7126e05d9cbcca535cee68a92
-DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
-DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
-DIST serde-1.0.90.crate 71415 BLAKE2B 7793a7d5227ecfa4645c9ce6cd22e0d9c76b216012bc4028e4f940938e1e4921c337cdd27deaa3ccb54df9fe57bee7ffc35f2c2d69c98a6b8e0964d7831af60f SHA512 6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d
 DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
-DIST serde_derive-1.0.90.crate 48815 BLAKE2B f662383f4fe4cd5fd46f763bcd3228eb54ec681231e6749ffe9c3710e3ebc49687eb25435cf9b976322df2cc478d4c9febe1d1d770aa4f11c4102745f52162bf SHA512 50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015
 DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
-DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
-DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-0.15.31.crate 146353 BLAKE2B 32501ffec548b675d405b24db7eeb53b04ccab9e58179aedd005094d13b42beadf831bf17d7e455cd6a9c7caf6c0df7ca8c345fb6b1a443c82a72b08314e4b24 SHA512 3c9ded90ae93d4634ddd10d51eaf08d89c5c0b1df67a8425299d9ff61ab09f40f7b0a9f222aedb276b231efd6f3c55776390c0d230fdcaa492167dc056c04ca7
 DIST syn-0.15.42.crate 185561 BLAKE2B 1c9bdd974393f020b6c56d78608349e52be836ca3a0f34f68a9c24107eafae02a32e998ceb5aa710be5f2b7101df71efba0bc9baaac36bc5c3ff156db5f879d4 SHA512 b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989
-DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST ucd-util-0.1.5.crate 26284 BLAKE2B 229c82089b0b070a812df63122e1413d59662c24e02c81a4b4d2c6a71eadf7f09505ff47376f9aafab3abb47eea1c7d28be9eb9377338a63839a3285a0468cd0 SHA512 14de9b370a49fe6fcce871e223daa257ca5e50e3d8cdfa3c6800db89ec4a0e6bac55e2b73990768fbc2a13a16d77c8b59015c4c4fe413735e7c893ac3651f5b3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8-ranges-1.0.3.crate 8496 BLAKE2B 835ab4083ad965c8b17a1571a1629802b9f081a2c7a0fb1fdd55a2734b36c3e2397f7da708d8d8d81c10761a624d95acefb44d423ec7fee672da2c17ea1c015b SHA512 24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8
-DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD ripgrep-11.0.1.ebuild 2593 BLAKE2B 405a168e0cb93f49863d8aee2a3649daaf34ca2ae6657f267fb2281297cab7ecac11449167fc1266f1b1ecf19655e9279623bd48942f043ed5be6e80f265d6e4 SHA512 5656d71145a10bd398b6d942562c7fa0f0c2673188a0720053ced25b0b839676e43e9aaa5fbd441e15dc77ff48e4bdd381457a4fd2325694a8b6317ecbddf67e
-EBUILD ripgrep-11.0.2.ebuild 2399 BLAKE2B 95504e8f68af5d4040cd0819fe14f5c506705ddeab1dcef248dd3dd044afce5974d2dff92cdce478ab349d3b7d9956b73f0d64c301dd25011dd434e7447ca11b SHA512 c890057a24fa0b55173b3148ccffa1efdd28ada81764313bada68b95924649f9d461332bee91ed662e22b5acbff1f2e40205d6fdc173921ec8d796c0a63c42e1
+EBUILD ripgrep-11.0.2.ebuild 2568 BLAKE2B 869b9ce5a3a053b87e2ac721e98364fa0244cd8f42f255ccefa91a3628d75d70064caecbe90401e4e6108f3acded31643f374d4c10f71e46e09e2d0dd3baa1c9 SHA512 2120f89f201965787bae5f545aec9fce473196fe5b81a382cb65772eee36f4e6facc73a4738fa3f9d6c2a4b2a8ecd9b9a02a8f8baa8f5a6966570e62222ace93
 MISC metadata.xml 730 BLAKE2B 0355062074dfce2208602756187dad5d57f281271fb156c7cabceba38b3097b21b9ca46c713c7aac661249676de4e79fef92c9111c58e4dec70f0f9ae8618ee0 SHA512 683936fa04bc52eed49d0c8c64b15d22cc2583abff4d4549abd6b9156e33a0a80a5088802e5b321c40debd30ea70e1f93877f8caaedb164ae6c8a703fe961460
diff --git a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
deleted file mode 100644
index 7c2dbd8ad9fd..000000000000
--- a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-atty-0.2.11
-autocfg-0.1.2
-base64-0.10.1
-bitflags-1.0.4
-bstr-0.1.2
-bytecount-0.5.1
-byteorder-1.3.1
-cc-1.0.35
-cfg-if-0.1.7
-clap-2.33.0
-cloudabi-0.0.3
-crossbeam-channel-0.3.8
-crossbeam-utils-0.6.5
-encoding_rs-0.8.17
-encoding_rs_io-0.1.6
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-glob-0.3.0
-globset-0.4.3
-grep-0.2.4
-grep-cli-0.1.2
-grep-matcher-0.1.2
-grep-pcre2-0.1.3
-grep-printer-0.1.2
-grep-regex-0.1.3
-grep-searcher-0.1.4
-ignore-0.4.7
-itoa-0.4.3
-lazy_static-1.3.0
-libc-0.2.51
-log-0.4.6
-memchr-2.2.0
-memmap-0.7.0
-num_cpus-1.10.0
-packed_simd-0.3.3
-pcre2-0.2.0
-pcre2-sys-0.2.0
-pkg-config-0.3.14
-proc-macro2-0.4.27
-quote-0.6.12
-rand-0.6.5
-rand_chacha-0.1.1
-rand_core-0.3.1
-rand_core-0.4.0
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_jitter-0.1.3
-rand_os-0.1.3
-rand_pcg-0.1.2
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.54
-redox_termios-0.1.1
-regex-1.1.6
-regex-automata-0.1.6
-regex-syntax-0.6.6
-remove_dir_all-0.5.1
-ripgrep-11.0.1
-ryu-0.2.7
-same-file-1.0.4
-serde-1.0.90
-serde_derive-1.0.90
-serde_json-1.0.39
-smallvec-0.6.9
-strsim-0.8.0
-syn-0.15.31
-tempfile-3.0.7
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.11.0
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-walkdir-2.2.7
-winapi-0.3.7
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo bash-completion-r1
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+man pcre"
-
-DEPEND=""
-
-RDEPEND="pcre? ( dev-libs/libpcre2 )"
-
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=virtual/rust-1.34
-	man? ( app-text/asciidoc )"
-
-QA_FLAGS_IGNORED="usr/bin/rg"
-
-src_compile() {
-	cargo_src_compile $(usex pcre "--features pcre2" "")
-}
-
-src_install() {
-	cargo_src_install --path=. $(usex pcre "--features pcre2" "")
-
-	# hack to find/install generated files
-	# stamp file can be present in multiple dirs if we build additional features
-	# so grab fist match only
-	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
-
-	if use man ; then
-	    doman "${BUILD_DIR}"/rg.1
-	fi
-
-	newbashcomp "${BUILD_DIR}"/rg.bash rg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/rg.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-
-	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
-}
diff --git a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild b/sys-apps/ripgrep/ripgrep-11.0.2.ebuild
index 3d20e3a68a98..641ce42111de 100644
--- a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild
+++ b/sys-apps/ripgrep/ripgrep-11.0.2.ebuild
@@ -78,9 +78,9 @@ HOMEPAGE="https://github.com/BurntSushi/ripgrep"
 SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 
-LICENSE="|| ( MIT Unlicense )"
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
 IUSE="+man pcre"
 
 DEPEND=""
@@ -95,11 +95,14 @@ BDEPEND="${RDEPEND}
 QA_FLAGS_IGNORED="usr/bin/rg"
 
 src_compile() {
+	# allow building on musl with dynamic linking support
+	# https://github.com/BurntSushi/rust-pcre2/issues/7
+	use elibc_musl && export PCRE2_SYS_STATIC=0
 	cargo_src_compile $(usex pcre "--features pcre2" "")
 }
 
 src_install() {
-	cargo_src_install --path=. $(usex pcre "--features pcre2" "")
+	cargo_src_install $(usex pcre "--features pcre2" "")
 
 	# hack to find/install generated files
 	# stamp file can be present in multiple dirs if we build additional features
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index d31a06a20224..bf8934903c88 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -15,9 +15,11 @@ DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b2210
 DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
+DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
 EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
 EBUILD rng-tools-6.7-r2.ebuild 2171 BLAKE2B f637ce1fc99a932b980ac2b811978cb4e943a0d71c14e567447b0372b276c086c1b30066074820cc5c1566b330108ebc39177855f06b15b5c8572ee4ffa94226 SHA512 44b9ed0930514d8b2e1a44b185b3601b955441ee23babcd5b42e149af32dc6177ed39529c729f374802c07688ce7350db74163c628168876ebdd0af7bcf853d8
 EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
+EBUILD rng-tools-6.9.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.9.ebuild b/sys-apps/rng-tools/rng-tools-6.9.ebuild
new file mode 100644
index 000000000000..85c8eb05db86
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	sys-fs/sysfsutils
+	jitterentropy? (
+		app-crypt/jitterentropy:=
+	)
+	nistbeacon? (
+		net-misc/curl[ssl]
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+	)
+	pkcs11? (
+		dev-libs/libp11:=
+		dev-libs/openssl:0=
+	)
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+	nistbeacon? (
+		virtual/pkgconfig
+	)
+"
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EROOT%/}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index ed45039daa09..00d0b060c1a6 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0
 DIST roccat-tools-5.7.0.tar.bz2 3737735 BLAKE2B fdd86cef425f1f33309165673be52c8297380a1f0a722e827c2b3697c59dd787f4b473186ab5b8ff8fadcfc851f3bb5e76c8407d831b31f82cd360679d3c1a09 SHA512 209f9fa5302806a2d2681077e990a39a4913d47b82e73f9acd86f734affd8b3a7c0087e815e5cc1dfec1787d868d09b87211d9c2a90f2ced67c150eec1b2d290
 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
 EBUILD roccat-tools-5.7.0.ebuild 2442 BLAKE2B ab3f4152fd8ff6f0575a5aa9a109e79044a2abc93315d6e93f07daa789a5bc15739218eafcaadc46258274951e688aa0252ca94c182868323f1822ebad5e9dba SHA512 b8cb3fdf8e5a28012155c324a9110a0ed8558be43795335da1ef57001119c104d26c12ff68e562502d481e46eccbba8b4000eeca35dc43ea7de634077c6fa28c
-EBUILD roccat-tools-5.9.0.ebuild 2743 BLAKE2B a51e580dbc48d7b054d973522113e3cba58d6059b4c7a84320ce57b2c6faccb1898af4b20b87daee54500ed88f72cf303d17c132d2f2824af617ceee050ae9ae SHA512 e24d6df50393cf536a82895d041c476ff268817e61364dc42cf5cd4f73d12ec01f6228325d9131629ff7f31993b1ca24a397cac74d8cf4f3cf4f874cdeb4cef2
+EBUILD roccat-tools-5.9.0.ebuild 2900 BLAKE2B f39932a29c8565de43dc20c6317c1b279d27425d0d0bea521e68b90eb94b4f42a1a2779c07939f95f9d2dede21fe0d2952a78dba2dfec393064679c13da1ccec SHA512 25a2cdc3ffe014c3db690a1de4ca33796fa67108747b84d55bd0488725e1097ab811c772912cec4751b7319d7a9363dde862d238189e023a2a18b44c899a22dc
 MISC metadata.xml 327 BLAKE2B b3a42ce918857aaa3ebe1705560661d80d9dc1cce60b5d79bddc1ead356cced572fe18d8b8d18f6c8f2ebb80393cc02efc4df3ad711aca08a67a15a1abd93e60 SHA512 99ed72c1a2a183157d0aded6f95c41c81c9c3d97f81c7267743ad3431676e2af1d7e08e4904761583af17806f5befd7254ca9f2ad170266d038053c7076a630e
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
index db2565cfe822..3cc91e932e03 100644
--- a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
+++ b/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit readme.gentoo-r1 cmake-utils udev user xdg
+inherit readme.gentoo-r1 cmake flag-o-matic toolchain-funcs udev user xdg
 
 DESCRIPTION="Utility for advanced configuration of Roccat devices"
 
@@ -62,6 +62,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( Changelog KNOWN_LIMITATIONS README )
 
@@ -74,12 +77,18 @@ pkg_setup() {
 	done
 }
 
-# Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
+# Required because xdg.eclass overrides src_prepare() from cmake.eclass
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
+	if has_version \>=x11-libs/pango-1.44.0 ; then
+		# Fix build with pango-1.44 which depends on harfbuzz
+		local PKGCONF="$(tc-getPKG_CONFIG)"
+		append-cflags "$(${PKGCONF} --cflags harfbuzz)"
+	fi
+
 	mycmakeargs=(
 		-DDEVICES="${USED_MODELS/;/}"
 		-DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d"
@@ -98,11 +107,11 @@ src_configure() {
 		fi
 	done
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	local stat_dir=/var/lib/roccat
 	keepdir ${stat_dir}
 	fowners root:roccat ${stat_dir}
@@ -110,10 +119,6 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 	readme.gentoo_print_elog
@@ -122,7 +127,3 @@ pkg_postinst() {
 	ewarn "affected folder(s) in /var/lib/roccat"
 	ewarn
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 0b68337637ac..20d20f818745 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 716 BLAKE2B 5c64e105fb653ff7705fff6ce4f233f11d0609eb0e6d154272bb8ddad00aa12d90a5bf37b5d6ea4e093d5d15d40d0936820b8e5789a4a94fb02aad6e77c68272 SHA512 866135f814d842aa697d455d2e154f2525f8e1f533bf9e7fcf4cfcbaeec429a13b7f4c33e2f4f714a0f513a3c5bb0a6983bb1f273fc42c8043e35e27299b5ccb
+MISC metadata.xml 613 BLAKE2B bc2c03cc9d2d45497a6dc07dda8254da8eabcbeda57d4d498a6cd54ed9aef47e21c07e377caebf128c5d629dbdbff96fa3fad5945b04baab165955900c2548b3 SHA512 7423081e816cb5a093168cf4b21cff5a441319cdf0fe16e89049ed98371c43b9abaeeb83de88b7160705ededf64572b5b325e5bf7fe5155f0bd20b35a6f1b97d
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 8035da6946ee..e45befd4bc71 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index a0ed61b82d52..a1d2f0419c1d 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 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
+MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 34f39bd4b285..ed6e85cfdb12 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index adf35ba9cf6f..0ffbbacd95f1 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 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
+MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index 34f39bd4b285..ed6e85cfdb12 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 4f5c594cf33b..81a70b6f3b46 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 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
+MISC metadata.xml 475 BLAKE2B c811a9a8cdf0219a1e8367c6e5d5231672b1d744f1b0374433757af7b862413faf750dcb89ec0a1600d4683510bd0bc68cdda8c86919ecd4965cf25834f37e6a SHA512 1cbfcf19f1a73d317bc688250f6fb5635344b56b87bcf26fbca80cac7d7c1bce34dceed396a13ed7de7a86b7fc75b8304611a23b2f8f235b21cf57a742c06348
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 34f39bd4b285..ed6e85cfdb12 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 0878c54628a7..797e2c2f316a 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 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
+MISC metadata.xml 640 BLAKE2B 892084cfb2c287c01d24489fd4639def30f4ad42b2c81d5b87479784fb2f68de633846eebe30cd747360195b5d90edfc9f5127a8ad1789a2a7cba9754279774d SHA512 9b6c0b9ad73dc818a0f25d0cffc3ed54c3ba8a0e1917370a2f2f4733a973a63cc0033673d8805ece30cab2e611775b10caad8a48b48239ee1bcca3dd3e05d15e
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index b8be92c8b77b..311d57d392d8 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -6,10 +6,6 @@
 		<name>William Hubbs</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 759f2ae4f7ad..47f9764891a6 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,5 +1,7 @@
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
 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.5.ebuild 1754 BLAKE2B 378e3f30251c058eb87608c952c941892245e6c41dea873ca7fbf34d1fa1a53248422801a6728b17b3bba0b499233dc32eefe9108e2ce31e5500eb6af691e848 SHA512 a4a9f5d17ff2c46860dbd3da1ebfc1f6eb2ba7f4009b4f39dd4ef27922cf7d31fc0f09ca680ef465ce062ceb28980db7fb97553ad92ea3f580495f99319da37e
-EBUILD sed-4.7.ebuild 1767 BLAKE2B b57cd201bd27d85a227d70136bfd7c03e59240f9ddb73ccbfaee71aa7de4ecde09b10f2d46dec8d075efeee461342435389587ea1f0df135351c05ea68c78ae1 SHA512 aa35d1b48f72f347bb401f6c22b726937d6ea756c3ac0f1e49f4ca73a63eeb7f3e74978261592ef5b58c4d301021055a4b119601aa10bba999e556e244323971
+EBUILD sed-4.7.ebuild 1766 BLAKE2B d01e8c4fd59b1b184ba5b8f89d1d11b1443f384c199eb251b8cc10ce6f8769f1851e31ca066822bbab2bdc4eb927a12e4550243a02699459e6e0aa6d40143bb0 SHA512 847b1ef29eb9eeef268509fd2ce3976a192de4555ce43bdf3d192cb574dee5c448f35b3dffe0212503e4a2b79a4b23190be49cbda26b9992bc3ed97003af7c75
+EBUILD sed-4.8.ebuild 1767 BLAKE2B f73107d19359fb5143078428ed9e8a8f46dc253b98f2120408b4e4d1562ed71f8f556e7c00082345ad1543c14a8670396ad20e93e283e8c7243a805b33dce37f SHA512 5d7c86fdbfdcf0f86b459b52db1df930623c37e8ef9e7b775b36842a7f27177653855cd0ec80d8d02cbd8d49062207966209656900fc953f023dba9e21d956f6
 MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 275a68c71381..ea7e565e8511 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="acl forced-sandbox nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
new file mode 100644
index 000000000000..eee25f42b285
--- /dev/null
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
+SRC_URI="mirror://gnu/sed/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="acl forced-sandbox nls selinux static"
+
+RDEPEND="acl? ( virtual/acl )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_bootstrap_sed() {
+	# make sure system-sed works #40786 #650052
+	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
+	fi
+}
+
+src_prepare() {
+	# Don't use sed before bootstrap if we have to recover a broken host sed.
+	src_bootstrap_sed
+
+	default
+
+	if use forced-sandbox ; then
+		# Upstream doesn't want to add a configure flag for this.
+		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
+		sed -i \
+			-e '/^bool sandbox = false;/s:false:true:' \
+			sed/sed.c || die
+		# Make sure the sed took.
+		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
+	fi
+}
+
+src_configure() {
+	local myconf=()
+	if use userland_GNU; then
+		myconf+=( --exec-prefix="${EPREFIX}" )
+	else
+		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)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index d00b3eebe900..d78dc2723698 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
 DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067ddaf71394a0a143a096d5708c5e7caa468b12826965c02af0b994f35d26c573187bf67c8d1ce75f5e8a31a1fb0fc6562 SHA512 743df60a643477465e4355880c56813ea8539415ea7c9631fb9b7cd7969a37cce572a6a94b785065d92baf9d7b6c753daa5d2f9709df7c9203c7effba46d58f2
-EBUILD selinux-python-2.9.ebuild 2555 BLAKE2B 70d88cf417951b6a0ca45fd199a1f58ebac34bed9900d001e96d4243583c39cea4c91fc33b1d78abcb70f15a865c1c8086855dfe6b066b25989e7d8f3cfbac90 SHA512 522c8bd6fc462e036f38cc9812ffdebf2abb1af87c903ffa0012a5d52066476be5a24f0f274a8586c6ab5d36f7e90055c21dcd76677d56c5c62688671c7f6234
-EBUILD selinux-python-3.0.ebuild 2561 BLAKE2B 290232771dd5124ba7d2f0b25c9c7e8372f5533b189f381b76c092d81309b2dce16821ab11f29df040d2e4b5a16ddae14148a227695d51be314e1ad5802b7de3 SHA512 e3a5ea35cbbe382f7d7ef233a6afb845639d7789896119efe8dbd3508967d94ffb71b9cf28fc0a468a4d529fa2d942f945c7ea8622a0e4217c79249ae831ddb9
-EBUILD selinux-python-9999.ebuild 2561 BLAKE2B 290232771dd5124ba7d2f0b25c9c7e8372f5533b189f381b76c092d81309b2dce16821ab11f29df040d2e4b5a16ddae14148a227695d51be314e1ad5802b7de3 SHA512 e3a5ea35cbbe382f7d7ef233a6afb845639d7789896119efe8dbd3508967d94ffb71b9cf28fc0a468a4d529fa2d942f945c7ea8622a0e4217c79249ae831ddb9
+EBUILD selinux-python-2.9.ebuild 2549 BLAKE2B 7d8d8c87a667c1e1e906c4f4ddbccb07135529036d381f27e48fa0ad7f9018b1d416834699d05fcd1ade903c55c6d9594b9279324622b489e34431afaaa18796 SHA512 c7ea15dade62ff124b1d234b2ead9014005f9058b752350f88a704cdcbcf9d2d7e2af738a15faddbe0983243d2c33e3bb32436df5069f68fb2ecabae08f775e3
+EBUILD selinux-python-3.0.ebuild 2557 BLAKE2B 26e35a0d84c264c0dc746cef6c2b442f56a376e0f22eead89aadcecb232874134a42d0f2bf92851cfed568479f0e26d8b37d0396a3eca824441cafae548b7429 SHA512 dd23617e8d8ca765f133a52cc1bc2f46f36a4a8b3b53c91b7357f4a994da03f6f255263f6c1ae8f1026cefabd499be63ec2804d90aca16ba09c6d5d33d54fca3
+EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 26e35a0d84c264c0dc746cef6c2b442f56a376e0f22eead89aadcecb232874134a42d0f2bf92851cfed568479f0e26d8b37d0396a3eca824441cafae548b7429 SHA512 dd23617e8d8ca765f133a52cc1bc2f46f36a4a8b3b53c91b7357f4a994da03f6f255263f6c1ae8f1026cefabd499be63ec2804d90aca16ba09c6d5d33d54fca3
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-2.9.ebuild b/sys-apps/selinux-python/selinux-python-2.9.ebuild
index 925ab20f61a9..f3280a473536 100644
--- a/sys-apps/selinux-python/selinux-python-2.9.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/selinux-python/selinux-python-3.0.ebuild b/sys-apps/selinux-python/selinux-python-3.0.ebuild
index 6dca5e8b459a..fa000d4f1a30 100644
--- a/sys-apps/selinux-python/selinux-python-3.0.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 6dca5e8b459a..fa000d4f1a30 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/sensei-raw-ctl/Manifest b/sys-apps/sensei-raw-ctl/Manifest
index 1b7b5cce4c47..ba2f2652c155 100644
--- a/sys-apps/sensei-raw-ctl/Manifest
+++ b/sys-apps/sensei-raw-ctl/Manifest
@@ -1,3 +1,3 @@
 DIST sensei-raw-ctl-0.0_pre20180729.tar.gz 16103 BLAKE2B b3e1348768663bbac7e7668ad8874c2831127b11a7ee57a9952a33ce96c404d34f50ab08bedc29f8a2c2599f4b179bd98717cece836c782b0c03f91e99c6c00d SHA512 e613ed13ad7321dd005067f989f5c487f2f6edf7e795be903f6d32b9ed8ae5874dfd928d678ef6bf38f792bdc54740f200533008f2959208d8ac9a73f3b8994b
-EBUILD sensei-raw-ctl-0.0_pre20180729.ebuild 625 BLAKE2B 871238811f8564b2b252acf7a400dc900c10db1095ce216aac076b96cd36f32832b9d91a68b0e7b4f8ea22177db08b42005fc36abaaed59084c9a31e4b19f233 SHA512 c7ef57cb5a491e4c37c4e09f9ee2f85bfe16cf2d6d0736041ecb913172ba95c6cc2c7ca90058fbe78af1a548bd9ffa281d82b461f5aa527c15a63db5d39585da
+EBUILD sensei-raw-ctl-0.0_pre20180729.ebuild 655 BLAKE2B 144ddfdb50506afc2df6494285ad7a69a6033fd5c74a208648130c33ceab23ef7f5bd5aa90a6104dbaacf3f02fe1c4bf05f1b6c40a2b4920033e51a424ce7e0a SHA512 3c4b9ed892812d3617854281a99512a15288ef887101e32fecc7a76c5308a1f0828031d024c3f0d9bbe13baa1ac7ac5aa15eb1c97f0e96ba1ca366f59908b1f5
 MISC metadata.xml 414 BLAKE2B cf91ea602380b435218ea1e9d4dc27160ae3c5eb4d12b63e4a8a681431dd0a402f8f7a7f0983d7a6c2ca531685c53af200dfffd0e82d50e5e24856cbfb62d976 SHA512 1958a1cb7c60e4212277e199ed4bdb3bfa4ffd469bddcc7e62e9d13f48d03fb7cc8a0bbab7626b012de414d6c682b5187e71286ab147239276cfca5e338948e1
diff --git a/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild b/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
index 1afb62454342..6b3f79444953 100644
--- a/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
+++ b/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils
 
 DESCRIPTION="SteelSeries Sensei Raw configuration tool"
 HOMEPAGE="https://git.janouch.name/p/sensei-raw-ctl"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://git.janouch.name/p/sensei-raw-ctl/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index de0ba7aebde7..770eeef93f7f 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -9,5 +9,5 @@ DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f
 DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
 EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
 EBUILD shadow-4.7-r2.ebuild 5794 BLAKE2B f7a8dde2cac49657be337c7e226e6341c764ee0ed9ab1aa6e9d2bba96eb1f903c9fdb63c77152f5fd1ed1a4493fdd16a87ef6a01010c493650deb0a05da9a8e3 SHA512 9965f73207d382ca980fc996978ea6db7520b343029c61ae0d192ef4cb77dafe89e42142dcf561648c224415d1d696bcc865bce0544744e77579ba62a928e80b
-EBUILD shadow-4.8-r1.ebuild 5822 BLAKE2B 83b25419543bd8f7905822f73971ae4f024cedd451d608d1f8568079ff05cb673b74cf8056364bca8c5af8a9c364e79bd149ec063b3cd3aedcc63c30a43cb943 SHA512 ef1e8110e27c67a5ff1ab766ddfeef9c104d1d2f508cac5589486353183465e41e4f24253b8542486ec1ef5015c119cdddb054e98a82618d1b94b3d3e560d23e
+EBUILD shadow-4.8-r2.ebuild 5855 BLAKE2B 965b32c9bec14bb3974e0bb576fa7cbee71dfee64015da653a6a2d1a08f2ea59aae6b4490f3f24c3ddad7982fdccbd5a3da8e4634778093809d508f2aa0b8c9b SHA512 2feae1d196ef0e6eddf74417ae846921e8c94fa820dc7f10d0e66d7748523db265810080f676291d2cb89d998a5c6467a857ad76d2facf8c76faf8cce5e9a3a3
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8-r1.ebuild b/sys-apps/shadow/shadow-4.8-r2.ebuild
index 181e391ab249..217787bfae14 100644
--- a/sys-apps/shadow/shadow-4.8-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r2.ebuild
@@ -52,11 +52,12 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-account-tools-setuid
+		--enable-shared=no
+		--enable-static=yes
 		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
-		--enable-shared=no
-		--enable-static=yes
 		$(use_enable nls)
 		$(use_with acl)
 		$(use_with audit)
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index c501bf56d937..c97a2786ef83 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -2,6 +2,8 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
+DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
 EBUILD smartmontools-7.0-r1.ebuild 4102 BLAKE2B a2cbaf7b757278e103298093a5b1c7ca164fef6260a050528e1a6d6aafd5baa5d775c4e8fd2d02d35e643a2e3480ee24f54608cdbd412f66bc31bfed4f039944 SHA512 17d51026674e290a4b650bcd119b272f165953cf2831d63afda025e6ffb9b64ee398488192c799d813252584f451126416d252560b34d1f43ca005ff757d0d6a
+EBUILD smartmontools-7.1.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
 EBUILD smartmontools-9999.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild
new file mode 100644
index 000000000000..9f111458dc66
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
+HOMEPAGE="https://www.smartmontools.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +daemon selinux static systemd update_drivedb"
+
+DEPEND="
+	caps? (
+		static? ( sys-libs/libcap-ng[static-libs] )
+		!static? ( sys-libs/libcap-ng )
+	)
+	kernel_FreeBSD? (
+		sys-freebsd/freebsd-lib[usb]
+	)
+	selinux? (
+		sys-libs/libselinux
+	)"
+RDEPEND="${DEPEND}
+	daemon? ( virtual/mailx )
+	selinux? ( sec-policy/selinux-smartmon )
+	systemd? ( sys-apps/systemd )
+	update_drivedb? (
+		app-crypt/gnupg
+		|| (
+			net-misc/curl
+			net-misc/wget
+			www-client/lynx
+			dev-vcs/subversion
+		)
+	)
+"
+
+REQUIRED_USE="( caps? ( daemon ) )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	myeconfargs=(
+		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
+		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
+		$(use_with caps libcap-ng)
+		$(use_with selinux)
+		$(use_with systemd libsystemd)
+		$(use_with update_drivedb gnupg)
+		$(use_with update_drivedb update-smart-drivedb)
+		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local db_path="/var/db/${PN}"
+
+	if use daemon; then
+		default
+
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+	else
+		dosbin smartctl
+		doman smartctl.8
+
+		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
+		einstalldocs
+	fi
+
+	if use update_drivedb ; then
+		if ! use daemon; then
+			dosbin "${S}"/update-smart-drivedb
+		fi
+
+		exeinto /etc/cron.monthly
+		doexe "${FILESDIR}/${PN}-update-drivedb"
+	fi
+
+	if use daemon || use update_drivedb; then
+		keepdir "${db_path}"
+
+		# Install a copy of the initial drivedb.h to /usr/share/${PN}
+		# so that we can access that file later in pkg_postinst
+		# even when dealing with binary packages (bug #575292)
+		insinto /usr/share/${PN}
+		doins "${S}"/drivedb.h
+	fi
+
+	# Make sure we never install drivedb.h into the db location
+	# of the acutal image so we don't record hashes because user
+	# can modify that file
+	rm -f "${ED%/}${db_path}/drivedb.h" || die
+
+	# Bug #622072
+	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
+}
+
+pkg_postinst() {
+	if use daemon || use update_drivedb; then
+		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX%/}/var/db/${PN}"
+
+		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
+			# No initial database found
+			cp "${initial_db_file}" "${db_path}" || die
+			einfo "Default drive database which was shipped with this release of ${PN}"
+			einfo "has been installed to '${db_path}'."
+		else
+			ewarn "WARNING: There's already a drive database in '${db_path}'!"
+			ewarn "Because we cannot determine if this database is untouched"
+			ewarn "or was modified by the user you have to manually update the"
+			ewarn "drive database:"
+			ewarn ""
+			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
+			ewarn "   release which can be found in '${initial_db_file}', i.e."
+			ewarn ""
+			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
+			ewarn ""
+			ewarn "b) Run the following command as root:"
+			ewarn ""
+			ewarn "     /usr/sbin/update-smart-drivedb"
+
+			if ! use update_drivedb ; then
+				ewarn ""
+				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
+				ewarn "with USE='update_drivedb'."
+			fi
+		fi
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 9f45950f17be..c6a564cde192 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,23 +1,11 @@
-AUX 242-file-max.patch 1314 BLAKE2B 3057d95ff701e188da4fba3b72b8a6e17dec2350a67e056cf1a2e0fa216d0b3aec22cbfbacd11e6ee17331cbda27dbf201fbc9ba2aa794fec9efbe0f612b3b43 SHA512 508a0b56b55839bccef3b3dc48f054e3d2876936cd8a36009dbadaa9a0ae85a5897f95de5c9c4b0e48d80d176e788fa342bd4235224e8cf3adacbe04dfbcebd0
-AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
-AUX 242-network-domains.patch 2373 BLAKE2B cc9253d3d8f579ef61c2eae0e5e2446afa68a339233b10b3d184cfaa21e6b6c7c53e9d2aa824b80f46ba31a9bded0b55b9a84a8463806edf9ebed0de13f937f5 SHA512 9a3f86e306f69237ae2e3572ac2f0eba1603adff622304e676a06b51ae6f41f68e269f69bdcbbdf537c99b6a9decfdfebe0527d7c500566ae72b8170011f2e26
-AUX 242-networkd-ipv6-token.patch 6525 BLAKE2B 4bbf64154f96419df91caf03f827f37bfb84db6367cb0e618d4a1f34910c3e84793b188d85330c21005dc25300f4b7ae7182d95fe1e0b6c61168dd9d63b2a36d SHA512 e1d230c9b2f1938ff9ca22452ba88ec71454eab6d797f51110d1e80719900dbc7fcb81baced914ac2499878340723183694aca3bb00c956d8fee5cf3f0ad841c
-AUX 242-rdrand-ryzen.patch 16177 BLAKE2B 7d1d3709098a233ba58727788b77c30025c0497fff9abb1df007e21160da3f93a7e9d14b0eeb7e6855bbe5fa93abfeda118156cbba355fc2976c83debcbb91d4 SHA512 38d00535a118b060accb8ed4e87681bab5e547270ef7e0abcdcf4766367e22761ffc35d0db7c829e86e0ad45f13cf4c761e71cfdfc70c2675056ef217c85618d
-AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
-AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
 AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
-AUX CVE-2019-15718.patch 1232 BLAKE2B e5be62414a1f9c19c8834e093d166a025fbd5215223845df365c70afb35487bd393bcd5463a046107e384a43976dcbb57e9e0a4013355558982abe8b6baf35de SHA512 45017c2c6ff5b16206e4c2e78c82c231372fd13c965a64908d70c0019a0894f1599a4412df3efc1ad6b799df018c05560fbbc8a24ffb86f793a149d9aec2080f
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
-DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
-EBUILD systemd-242-r6.ebuild 14157 BLAKE2B eebb763acfe83ff486867663b3485605730725b00aa7e802624ba8f04bb64e4c4e269f617ab37b5322cd29d878aa4a604919993a9767ff99be4db325503d0edd SHA512 66804d5aa53ec07c841d0d6f6bf6eeb3e610b90f43e449f84550a67a8ead10bdef34a43df2839710e4f62410c94c72478cbb4b0ab3aa4d184d58628b50f94ad6
-EBUILD systemd-242-r7.ebuild 14195 BLAKE2B 96ca4520a2eaeca5c970adad294080b06c4e928b8369f52f55e7099116864ef76c38edc387c2315654213a98dc502fb7db9d6067c9baa9462ba204d18ea9ab42 SHA512 56bcdb8ecc8cca4e68708f7b17d57592d62ccf43dc4144505251d06f8763d1e9260a1c97547d2b7889119a1e81e890061d5e73786d552c6acd7175d207ca132f
-EBUILD systemd-243-r2.ebuild 14506 BLAKE2B fbca09a3218b2015535c6e84287449749e86ba294f1db4c96940596f7dda54dd96d5aef3fe556e9c27b1189a55a7ff3c896cbb5bcf5cc0ac251d5a1485938391 SHA512 2f61f619ca7afb9f8c89fb7dc8fb135fa04ee67a3094a30222a5bbb75269eff4aa9926f22e6c93119ab317fc19aefec76e2677c0cde5ae9865037b8ce12fef82
-EBUILD systemd-243.ebuild 14255 BLAKE2B bcdf5056bce2710f3c088dfdb686c001816ad5fae721c06153d0eab50ae610f49b6449f4d6b4cb0abe0546f38f76a169569886b0f2446d3248a6d8f0b4c1216e SHA512 b8459206cc0395c6755ffe74cee27e48913c979204dbb794c659ad7c2cf8005d75ff4dda5984f65341cf04b7370a8a3d83718b8f9dc7c9fc1958203f31338a52
-EBUILD systemd-244.ebuild 14457 BLAKE2B c26538d4869e2771d3a6181299d4b12f601e8f636eb964c2dbc7f75caca4679b0bd6ea45af037ed6427b7d8c851b018a345298d6d0bf7536c719353d16d5d30e SHA512 dc3debcda12b171cd99e137a0a63ba5506900a5bf39621ed64d0423eebb2b512efce9059167746171e17e63a1a35a7953be7e4b3a9406c4b9afd70cfed03e840
-EBUILD systemd-9999.ebuild 14457 BLAKE2B c26538d4869e2771d3a6181299d4b12f601e8f636eb964c2dbc7f75caca4679b0bd6ea45af037ed6427b7d8c851b018a345298d6d0bf7536c719353d16d5d30e SHA512 dc3debcda12b171cd99e137a0a63ba5506900a5bf39621ed64d0423eebb2b512efce9059167746171e17e63a1a35a7953be7e4b3a9406c4b9afd70cfed03e840
-MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
+EBUILD systemd-243-r2.ebuild 14521 BLAKE2B 1733a3484ab1caff846419e0453a07c263a32d974505abab93af09dd622e1cb68224711e64231a9156447f262d062639b89e76ad5f865bb563984f5c8acb4695 SHA512 86be07a14043096b696658e17da0abcb1a2b7426d4540502f0a6e745f7a8c2a8d3542bbee9e6607bbb5223999613175db4865e7b40a75e51dccfe87f799b9dba
+EBUILD systemd-244.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
+EBUILD systemd-9999.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
+MISC metadata.xml 2019 BLAKE2B 84de0a0abc3f16fab60db2343d8e1f0dee8a3f03ac97bffd01167820815f4d41d87c118b81041046c8cafa6316fb7e5bfe9d6a5de550bf617ace56ccf69efb0d SHA512 086189b961c0f3be70beb1d86fd36508d0821407243e74cf896360f76ce04be544aac211d60685256080fa75e1ac0ae33211501cc11ee98913f3b8d322ac9f03
diff --git a/sys-apps/systemd/files/242-file-max.patch b/sys-apps/systemd/files/242-file-max.patch
deleted file mode 100644
index 0a1fe950e298..000000000000
--- a/sys-apps/systemd/files/242-file-max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 17 Jun 2019 10:51:25 +0200
-Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
- ULONG_MAX
-
-Since kernel 5.2 the kernel thankfully returns proper errors when we
-write a value out of range to the sysctl. Which however breaks writing
-ULONG_MAX to request the maximum value. Hence let's write the new
-maximum value instead, LONG_MAX.
----
- src/core/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/main.c b/src/core/main.c
-index b33ea1b5b52..e7f51815f07 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
- #endif
- 
- #if BUMP_PROC_SYS_FS_FILE_MAX
--        /* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as glibc/gcc define that as
--         * "(0x7fffffffffffffffL * 2UL + 1UL)". Seriously. 😢 */
--        if (asprintf(&t, "%lu\n", ULONG_MAX) < 0) {
-+        /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously thing where
-+         * different but the operation would fail silently.) */
-+        if (asprintf(&t, "%li\n", LONG_MAX) < 0) {
-                 log_oom();
-                 return;
-         }
diff --git a/sys-apps/systemd/files/242-gcc-9.patch b/sys-apps/systemd/files/242-gcc-9.patch
deleted file mode 100644
index e9f690a65be5..000000000000
--- a/sys-apps/systemd/files/242-gcc-9.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2019 13:46:55 +0200
-Subject: [PATCH] network: remove redunant link name in message
-
-Fixes #12454.
-
-gcc was complaining that the link->ifname argument is NULL. Adding
-assert(link->ifname) right before the call has no effect. It seems that
-gcc is confused by the fact that log_link_warning_errno() internally
-calls log_object(), with link->ifname passed as the object. log_object()
-is also a macro and is does a check whether the passed object is NULL.
-So we have a check if something is NULL right next an unconditional use
-of it where it cannot be NULL. I think it's a bug in gcc.
-
-Anyway, we don't need to use link->ifname here. log_object() already prepends
-the object name to the message.
----
- src/network/networkd-link.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 533193ac932..6fc82940033 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
- 
-         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
-         if (r < 0)
--                log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
--                                       enable_disable(!disabled), link->ifname);
-+                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
-         else
-                 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
- 
-From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 22 May 2019 10:31:01 -0400
-Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
-
-Fixes: https://github.com/systemd/systemd/issues/12534
----
- src/shared/machine-image.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index 6b9d8fb97a6..6a6d952b424 100644
---- a/src/shared/machine-image.c
-+++ b/src/shared/machine-image.c
-@@ -201,11 +201,13 @@ static int image_make(
-                 Image **ret) {
- 
-         _cleanup_free_ char *pretty_buffer = NULL;
-+        _cleanup_free_ char *cwd = NULL;
-         struct stat stbuf;
-         bool read_only;
-         int r;
- 
-         assert(dfd >= 0 || dfd == AT_FDCWD);
-+        assert(path || dfd == AT_FDCWD);
-         assert(filename);
- 
-         /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
-@@ -221,6 +223,9 @@ static int image_make(
-                 st = &stbuf;
-         }
- 
-+        if (!path)
-+                safe_getcwd(&cwd);
-+
-         read_only =
-                 (path && path_startswith(path, "/usr")) ||
-                 (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
-@@ -359,7 +364,7 @@ static int image_make(
- 
-                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
-                 if (block_fd < 0)
--                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
-+                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-                 else {
-                         /* Refresh stat data after opening the node */
-                         if (fstat(block_fd, &stbuf) < 0)
-@@ -373,13 +378,13 @@ static int image_make(
-                                 int state = 0;
- 
-                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
--                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
-+                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-                                 else if (state)
-                                         read_only = true;
-                         }
- 
-                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
--                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
-+                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
- 
-                         block_fd = safe_close(block_fd);
-                 }
-From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 24 May 2019 10:54:09 +0200
-Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
- first argument is specified
-
-A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
----
- src/shared/machine-image.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index 6a6d952b424..55e5f08f91e 100644
---- a/src/shared/machine-image.c
-+++ b/src/shared/machine-image.c
-@@ -200,8 +200,7 @@ static int image_make(
-                 const struct stat *st,
-                 Image **ret) {
- 
--        _cleanup_free_ char *pretty_buffer = NULL;
--        _cleanup_free_ char *cwd = NULL;
-+        _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
-         struct stat stbuf;
-         bool read_only;
-         int r;
-@@ -223,8 +222,12 @@ static int image_make(
-                 st = &stbuf;
-         }
- 
--        if (!path)
--                safe_getcwd(&cwd);
-+        if (!path) {
-+                if (dfd == AT_FDCWD)
-+                        (void) safe_getcwd(&parent);
-+                else
-+                        (void) fd_get_path(dfd, &parent);
-+        }
- 
-         read_only =
-                 (path && path_startswith(path, "/usr")) ||
-@@ -364,7 +367,7 @@ static int image_make(
- 
-                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
-                 if (block_fd < 0)
--                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
-                 else {
-                         /* Refresh stat data after opening the node */
-                         if (fstat(block_fd, &stbuf) < 0)
-@@ -378,13 +381,13 @@ static int image_make(
-                                 int state = 0;
- 
-                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
--                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
-                                 else if (state)
-                                         read_only = true;
-                         }
- 
-                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
--                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
- 
-                         block_fd = safe_close(block_fd);
-                 }
diff --git a/sys-apps/systemd/files/242-network-domains.patch b/sys-apps/systemd/files/242-network-domains.patch
deleted file mode 100644
index 166a8ee5b76f..000000000000
--- a/sys-apps/systemd/files/242-network-domains.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fe0e16db093a7da09fcb52a2bc7017197047443d Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Mon, 13 May 2019 05:40:31 +0900
-Subject: [PATCH] network: do not use ordered_set_printf() for DOMAINS= or
- ROUTE_DOMAINS=
-
-This partially reverts 5e2a51d588dde4b52c6017ea80b75c16e6e23431.
-
-Fixes #12531.
----
- src/network/networkd-link.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index f8ee48802cb..1dc10c65a1b 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -3495,12 +3495,11 @@ int link_save(Link *link) {
-                 admin_state, oper_state);
- 
-         if (link->network) {
--                bool space;
-+                char **dhcp6_domains = NULL, **dhcp_domains = NULL;
-+                const char *dhcp_domainname = NULL, *p;
-                 sd_dhcp6_lease *dhcp6_lease = NULL;
--                const char *dhcp_domainname = NULL;
--                char **dhcp6_domains = NULL;
--                char **dhcp_domains = NULL;
-                 unsigned j;
-+                bool space;
- 
-                 fprintf(f, "REQUIRED_FOR_ONLINE=%s\n",
-                         yes_no(link->network->required_for_online));
-@@ -3617,7 +3616,10 @@ int link_save(Link *link) {
-                                 (void) sd_dhcp6_lease_get_domains(dhcp6_lease, &dhcp6_domains);
-                 }
- 
--                ordered_set_print(f, "DOMAINS=", link->network->search_domains);
-+                fputs("DOMAINS=", f);
-+                space = false;
-+                ORDERED_SET_FOREACH(p, link->network->search_domains, i)
-+                        fputs_with_space(f, p, NULL, &space);
- 
-                 if (link->network->dhcp_use_domains == DHCP_USE_DOMAINS_YES) {
-                         NDiscDNSSL *dd;
-@@ -3635,7 +3637,10 @@ int link_save(Link *link) {
- 
-                 fputc('\n', f);
- 
--                ordered_set_print(f, "ROUTE_DOMAINS=", link->network->route_domains);
-+                fputs("ROUTE_DOMAINS=", f);
-+                space = false;
-+                ORDERED_SET_FOREACH(p, link->network->route_domains, i)
-+                        fputs_with_space(f, p, NULL, &space);
- 
-                 if (link->network->dhcp_use_domains == DHCP_USE_DOMAINS_ROUTE) {
-                         NDiscDNSSL *dd;
diff --git a/sys-apps/systemd/files/242-networkd-ipv6-token.patch b/sys-apps/systemd/files/242-networkd-ipv6-token.patch
deleted file mode 100644
index 87a85f6f6ab0..000000000000
--- a/sys-apps/systemd/files/242-networkd-ipv6-token.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 4eb086a38712ea98faf41e075b84555b11b54362 Mon Sep 17 00:00:00 2001
-From: Susant Sahani <ssahani@gmail.com>
-Date: Thu, 9 May 2019 07:35:35 +0530
-Subject: [PATCH] networkd: fix link_up() (#12505)
-
-Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up.
-
-Fixes the following error:
-```
-dummy-test: Could not bring up interface: Invalid argument
-```
-
-After reading the kernel code when we do a link up
-```
-net/core/rtnetlink.c
-IFLA_AF_SPEC
- af_ops->set_link_af(dev, af);
-  inet6_set_link_af
-   if (tb[IFLA_INET6_ADDR_GEN_MODE])
-             Here it looks for IFLA_INET6_ADDR_GEN_MODE
-```
-Since link up we didn't filling up that it's failing.
-
-Closes #12504.
----
- src/network/networkd-link.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 3c8b5c5cb43..4db9f3f980f 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -2031,6 +2031,8 @@ static int link_up(Link *link) {
-         }
- 
-         if (link_ipv6_enabled(link)) {
-+                uint8_t ipv6ll_mode;
-+
-                 r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
-                 if (r < 0)
-                         return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
-@@ -2046,6 +2048,19 @@ static int link_up(Link *link) {
-                                 return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
-                 }
- 
-+                if (!link_ipv6ll_enabled(link))
-+                        ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
-+                else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
-+                        /* The file may not exist. And event if it exists, when stable_secret is unset,
-+                         * reading the file fails with EIO. */
-+                        ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
-+                else
-+                        ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
-+
-+                r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
-+                if (r < 0)
-+                        return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
-+
-                 r = sd_netlink_message_close_container(req);
-                 if (r < 0)
-                         return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
-From 9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 9 May 2019 14:39:46 +0900
-Subject: [PATCH] network: do not send ipv6 token to kernel
-
-We disabled kernel RA support. Then, we should not send
-IFLA_INET6_TOKEN.
-Thus, we do not need to send IFLA_INET6_ADDR_GEN_MODE twice.
-
-Follow-up for 0e2fdb83bb5e22047e0c7cc058b415d0e93f02cf and
-4eb086a38712ea98faf41e075b84555b11b54362.
----
- src/network/networkd-link.c | 51 +++++--------------------------------
- 1 file changed, 6 insertions(+), 45 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 2b6ff2b6c58..b6da4ea70b7 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -1954,6 +1954,9 @@ static int link_configure_addrgen_mode(Link *link) {
-         assert(link->manager);
-         assert(link->manager->rtnl);
- 
-+        if (!socket_ipv6_is_supported())
-+                return 0;
-+
-         log_link_debug(link, "Setting address genmode for link");
- 
-         r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
-@@ -2047,46 +2050,6 @@ static int link_up(Link *link) {
-                         return log_link_error_errno(link, r, "Could not set MAC address: %m");
-         }
- 
--        if (link_ipv6_enabled(link)) {
--                uint8_t ipv6ll_mode;
--
--                r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
--                if (r < 0)
--                        return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
--
--                /* if the kernel lacks ipv6 support setting IFF_UP fails if any ipv6 options are passed */
--                r = sd_netlink_message_open_container(req, AF_INET6);
--                if (r < 0)
--                        return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m");
--
--                if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) {
--                        r = sd_netlink_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6);
--                        if (r < 0)
--                                return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
--                }
--
--                if (!link_ipv6ll_enabled(link))
--                        ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
--                else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
--                        /* The file may not exist. And event if it exists, when stable_secret is unset,
--                         * reading the file fails with EIO. */
--                        ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
--                else
--                        ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
--
--                r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
--                if (r < 0)
--                        return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
--
--                r = sd_netlink_message_close_container(req);
--                if (r < 0)
--                        return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
--
--                r = sd_netlink_message_close_container(req);
--                if (r < 0)
--                        return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
--        }
--
-         r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler,
-                                link_netlink_destroy_callback, link);
-         if (r < 0)
-@@ -3226,11 +3189,9 @@ static int link_configure(Link *link) {
-         if (r < 0)
-                 return r;
- 
--        if (socket_ipv6_is_supported()) {
--                r = link_configure_addrgen_mode(link);
--                if (r < 0)
--                        return r;
--        }
-+        r = link_configure_addrgen_mode(link);
-+        if (r < 0)
-+                return r;
- 
-         return link_configure_after_setting_mtu(link);
- }
diff --git a/sys-apps/systemd/files/242-rdrand-ryzen.patch b/sys-apps/systemd/files/242-rdrand-ryzen.patch
deleted file mode 100644
index ec690c1b3f6c..000000000000
--- a/sys-apps/systemd/files/242-rdrand-ryzen.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-From d351699739471734666230ae3c6f9ba56ce5ce45 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2019 16:18:13 -0400
-Subject: [PATCH 1/6] =?UTF-8?q?random-util:=20rename=20RANDOM=5FDONT=5FDRA?=
- =?UTF-8?q?IN=20=E2=86=92=20RANDOM=5FMAY=5FFAIL?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The old flag name was a bit of a misnomer, as /dev/urandom cannot be
-"drained". Once it's initialized it's initialized and then is good
-forever. (Only /dev/random has a concept of 'draining', but we never use
-that, as it's an obsolete interface).
-
-The flag is still useful though, since it allows us to suppress accesses
-to the random pool while it is not initialized, as that trips up the
-kernel and it logs about any such attempts, which we really don't want.
-
-(cherry picked from commit 1a0ffa1e737e65312abac63dcf4b44e1ac0e1642)
----
- src/basic/random-util.c | 36 +++++++++++++++++++-----------------
- src/basic/random-util.h |  4 ++--
- 2 files changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index ca25fd2420..de29e07549 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -71,21 +71,22 @@ int genuine_random_bytes(void *p, size_t n, RandomFlags flags) {
-         bool got_some = false;
-         int r;
- 
--        /* Gathers some randomness from the kernel (or the CPU if the RANDOM_ALLOW_RDRAND flag is set). This call won't
--         * block, unless the RANDOM_BLOCK flag is set. If RANDOM_DONT_DRAIN is set, an error is returned if the random
--         * pool is not initialized. Otherwise it will always return some data from the kernel, regardless of whether
--         * the random pool is fully initialized or not. */
-+        /* Gathers some randomness from the kernel (or the CPU if the RANDOM_ALLOW_RDRAND flag is set). This
-+         * call won't block, unless the RANDOM_BLOCK flag is set. If RANDOM_MAY_FAIL is set, an error is
-+         * returned if the random pool is not initialized. Otherwise it will always return some data from the
-+         * kernel, regardless of whether the random pool is fully initialized or not. */
- 
-         if (n == 0)
-                 return 0;
- 
-         if (FLAGS_SET(flags, RANDOM_ALLOW_RDRAND))
--                /* Try x86-64' RDRAND intrinsic if we have it. We only use it if high quality randomness is not
--                 * required, as we don't trust it (who does?). Note that we only do a single iteration of RDRAND here,
--                 * even though the Intel docs suggest calling this in a tight loop of 10 invocations or so. That's
--                 * because we don't really care about the quality here. We generally prefer using RDRAND if the caller
--                 * allows us too, since this way we won't drain the kernel randomness pool if we don't need it, as the
--                 * pool's entropy is scarce. */
-+                /* Try x86-64' RDRAND intrinsic if we have it. We only use it if high quality randomness is
-+                 * not required, as we don't trust it (who does?). Note that we only do a single iteration of
-+                 * RDRAND here, even though the Intel docs suggest calling this in a tight loop of 10
-+                 * invocations or so. That's because we don't really care about the quality here. We
-+                 * generally prefer using RDRAND if the caller allows us to, since this way we won't upset
-+                 * the kernel's random subsystem by accessing it before the pool is initialized (after all it
-+                 * will kmsg log about every attempt to do so)..*/
-                 for (;;) {
-                         unsigned long u;
-                         size_t m;
-@@ -153,12 +154,13 @@ int genuine_random_bytes(void *p, size_t n, RandomFlags flags) {
-                                 break;
- 
-                         } else if (errno == EAGAIN) {
--                                /* The kernel has no entropy whatsoever. Let's remember to use the syscall the next
--                                 * time again though.
-+                                /* The kernel has no entropy whatsoever. Let's remember to use the syscall
-+                                 * the next time again though.
-                                  *
--                                 * If RANDOM_DONT_DRAIN is set, return an error so that random_bytes() can produce some
--                                 * pseudo-random bytes instead. Otherwise, fall back to /dev/urandom, which we know is empty,
--                                 * but the kernel will produce some bytes for us on a best-effort basis. */
-+                                 * If RANDOM_MAY_FAIL is set, return an error so that random_bytes() can
-+                                 * produce some pseudo-random bytes instead. Otherwise, fall back to
-+                                 * /dev/urandom, which we know is empty, but the kernel will produce some
-+                                 * bytes for us on a best-effort basis. */
-                                 have_syscall = true;
- 
-                                 if (got_some && FLAGS_SET(flags, RANDOM_EXTEND_WITH_PSEUDO)) {
-@@ -167,7 +169,7 @@ int genuine_random_bytes(void *p, size_t n, RandomFlags flags) {
-                                         return 0;
-                                 }
- 
--                                if (FLAGS_SET(flags, RANDOM_DONT_DRAIN))
-+                                if (FLAGS_SET(flags, RANDOM_MAY_FAIL))
-                                         return -ENODATA;
- 
-                                 /* Use /dev/urandom instead */
-@@ -250,7 +252,7 @@ void pseudo_random_bytes(void *p, size_t n) {
- 
- void random_bytes(void *p, size_t n) {
- 
--        if (genuine_random_bytes(p, n, RANDOM_EXTEND_WITH_PSEUDO|RANDOM_DONT_DRAIN|RANDOM_ALLOW_RDRAND) >= 0)
-+        if (genuine_random_bytes(p, n, RANDOM_EXTEND_WITH_PSEUDO|RANDOM_MAY_FAIL|RANDOM_ALLOW_RDRAND) >= 0)
-                 return;
- 
-         /* If for some reason some user made /dev/urandom unavailable to us, or the kernel has no entropy, use a PRNG instead. */
-diff --git a/src/basic/random-util.h b/src/basic/random-util.h
-index 3e8c288d3d..148b6c7813 100644
---- a/src/basic/random-util.h
-+++ b/src/basic/random-util.h
-@@ -8,11 +8,11 @@
- typedef enum RandomFlags {
-         RANDOM_EXTEND_WITH_PSEUDO = 1 << 0, /* If we can't get enough genuine randomness, but some, fill up the rest with pseudo-randomness */
-         RANDOM_BLOCK              = 1 << 1, /* Rather block than return crap randomness (only if the kernel supports that) */
--        RANDOM_DONT_DRAIN         = 1 << 2, /* If we can't get any randomness at all, return early with -EAGAIN */
-+        RANDOM_MAY_FAIL           = 1 << 2, /* If we can't get any randomness at all, return early with -ENODATA */
-         RANDOM_ALLOW_RDRAND       = 1 << 3, /* Allow usage of the CPU RNG */
- } RandomFlags;
- 
--int genuine_random_bytes(void *p, size_t n, RandomFlags flags); /* returns "genuine" randomness, optionally filled upwith pseudo random, if not enough is available */
-+int genuine_random_bytes(void *p, size_t n, RandomFlags flags); /* returns "genuine" randomness, optionally filled up with pseudo random, if not enough is available */
- void pseudo_random_bytes(void *p, size_t n);                    /* returns only pseudo-randommess (but possibly seeded from something better) */
- void random_bytes(void *p, size_t n);                           /* returns genuine randomness if cheaply available, and pseudo randomness if not. */
- 
--- 
-2.22.0
-
-
-From 1f492b9ecc31aa3782f9ce82058d8fb72a5c323f Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2019 16:21:44 -0400
-Subject: [PATCH 2/6] random-util: use gcc's bit_RDRND definition if it exists
-
-(cherry picked from commit cc28145d51f62711fdc4b4c229aecd5778806419)
----
- src/basic/random-util.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index de29e07549..205d5501e5 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -45,7 +45,12 @@ int rdrand(unsigned long *ret) {
-                         return -EOPNOTSUPP;
-                 }
- 
--                have_rdrand = !!(ecx & (1U << 30));
-+/* Compat with old gcc where bit_RDRND didn't exist yet */
-+#ifndef bit_RDRND
-+#define bit_RDRND (1U << 30)
-+#endif
-+
-+                have_rdrand = !!(ecx & bit_RDRND);
-         }
- 
-         if (have_rdrand == 0)
--- 
-2.22.0
-
-
-From 6460c540e6183dd19de89b7f0672b3b47c4d41cc Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2019 17:26:55 -0400
-Subject: [PATCH 3/6] random-util: hash AT_RANDOM getauxval() value before
- using it
-
-Let's be a bit paranoid and hash the 16 bytes we get from getauxval()
-before using them. AFter all they might be used by other stuff too (in
-particular ASLR), and we probably shouldn't end up leaking that seed
-though our crappy pseudo-random numbers.
-
-(cherry picked from commit 80eb560a5bd7439103036867d5e09a5e0393e5d3)
----
- src/basic/random-util.c | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index 205d5501e5..40f1928936 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -28,6 +28,7 @@
- #include "io-util.h"
- #include "missing.h"
- #include "random-util.h"
-+#include "siphash24.h"
- #include "time-util.h"
- 
- int rdrand(unsigned long *ret) {
-@@ -203,14 +204,19 @@ void initialize_srand(void) {
-                 return;
- 
- #if HAVE_SYS_AUXV_H
--        /* The kernel provides us with 16 bytes of entropy in auxv, so let's
--         * try to make use of that to seed the pseudo-random generator. It's
--         * better than nothing... */
-+        /* The kernel provides us with 16 bytes of entropy in auxv, so let's try to make use of that to seed
-+         * the pseudo-random generator. It's better than nothing... But let's first hash it to make it harder
-+         * to recover the original value by watching any pseudo-random bits we generate. After all the
-+         * AT_RANDOM data might be used by other stuff too (in particular: ASLR), and we probably shouldn't
-+         * leak the seed for that. */
- 
--        auxv = (const void*) getauxval(AT_RANDOM);
-+        auxv = ULONG_TO_PTR(getauxval(AT_RANDOM));
-         if (auxv) {
--                assert_cc(sizeof(x) <= 16);
--                memcpy(&x, auxv, sizeof(x));
-+                static const uint8_t auxval_hash_key[16] = {
-+                        0x92, 0x6e, 0xfe, 0x1b, 0xcf, 0x00, 0x52, 0x9c, 0xcc, 0x42, 0xcf, 0xdc, 0x94, 0x1f, 0x81, 0x0f
-+                };
-+
-+                x = (unsigned) siphash24(auxv, 16, auxval_hash_key);
-         } else
- #endif
-                 x = 0;
--- 
-2.22.0
-
-
-From 17d52f6320b45d1728af6007b4df4aaccc6fdaf4 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2019 18:51:26 -0400
-Subject: [PATCH 4/6] random-util: rename "err" to "success"
-
-After all rdrand returns 1 on success, and 0 on failure, hence let's
-name this accordingly.
-
-(cherry picked from commit 328f850e36e86d14ab06d11fa8f2397e9575a7f9)
----
- src/basic/random-util.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index 40f1928936..7c64857592 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -35,7 +35,7 @@ int rdrand(unsigned long *ret) {
- 
- #if defined(__i386__) || defined(__x86_64__)
-         static int have_rdrand = -1;
--        unsigned char err;
-+        uint8_t success;
- 
-         if (have_rdrand < 0) {
-                 uint32_t eax, ebx, ecx, edx;
-@@ -60,9 +60,9 @@ int rdrand(unsigned long *ret) {
-         asm volatile("rdrand %0;"
-                      "setc %1"
-                      : "=r" (*ret),
--                       "=qm" (err));
--        msan_unpoison(&err, sizeof(err));
--        if (!err)
-+                       "=qm" (success));
-+        msan_unpoison(&success, sizeof(sucess));
-+        if (!success)
-                 return -EAGAIN;
- 
-         return 0;
--- 
-2.22.0
-
-
-From a6c72245ba5ba688cd6544650b9c6e313b39b53e Mon Sep 17 00:00:00 2001
-From: Evgeny Vereshchagin <evvers@ya.ru>
-Date: Wed, 8 May 2019 15:50:53 +0200
-Subject: [PATCH 5/6] util-lib: fix a typo in rdrand
-
-Otherwise, the fuzzers will fail to compile with MSan:
-```
-../../src/systemd/src/basic/random-util.c:64:40: error: use of undeclared identifier 'sucess'; did you mean 'success'?
-        msan_unpoison(&success, sizeof(sucess));
-                                       ^~~~~~
-                                       success
-../../src/systemd/src/basic/alloc-util.h:169:50: note: expanded from macro 'msan_unpoison'
-                                                 ^
-../../src/systemd/src/basic/random-util.c:38:17: note: 'success' declared here
-        uint8_t success;
-                ^
-1 error generated.
-[80/545] Compiling C object 'src/basic/a6ba3eb@@basic@sta/process-util.c.o'.
-ninja: build stopped: subcommand failed.
-Fuzzers build failed
-```
-
-(cherry picked from commit 7f2cdceaed4d37c4e601e531c7d863fca1bd1460)
----
- src/basic/random-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index 7c64857592..b8bbf2d418 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -61,7 +61,7 @@ int rdrand(unsigned long *ret) {
-                      "setc %1"
-                      : "=r" (*ret),
-                        "=qm" (success));
--        msan_unpoison(&success, sizeof(sucess));
-+        msan_unpoison(&success, sizeof(success));
-         if (!success)
-                 return -EAGAIN;
- 
--- 
-2.22.0
-
-
-From 47eec0ae61c887cb8cc05ce8d49b8d151bc4ef25 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 10 May 2019 15:16:16 -0400
-Subject: [PATCH 6/6] random-util: eat up bad RDRAND values seen on AMD CPUs
-
-An ugly, ugly work-around for #11810. And no, we shouldn't have to do
-this. This is something for AMD, the firmware or the kernel to
-fix/work-around, not us. But nonetheless, this should do it for now.
-
-Fixes: #11810
-(cherry picked from commit 1c53d4a070edbec8ad2d384ba0014d0eb6bae077)
----
- src/basic/random-util.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index b8bbf2d418..0561f0cb22 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -35,6 +35,7 @@ int rdrand(unsigned long *ret) {
- 
- #if defined(__i386__) || defined(__x86_64__)
-         static int have_rdrand = -1;
-+        unsigned long v;
-         uint8_t success;
- 
-         if (have_rdrand < 0) {
-@@ -59,12 +60,24 @@ int rdrand(unsigned long *ret) {
- 
-         asm volatile("rdrand %0;"
-                      "setc %1"
--                     : "=r" (*ret),
-+                     : "=r" (v),
-                        "=qm" (success));
-         msan_unpoison(&success, sizeof(success));
-         if (!success)
-                 return -EAGAIN;
- 
-+        /* Apparently on some AMD CPUs RDRAND will sometimes (after a suspend/resume cycle?) report success
-+         * via the carry flag but nonetheless return the same fixed value -1 in all cases. This appears to be
-+         * a bad bug in the CPU or firmware. Let's deal with that and work-around this by explicitly checking
-+         * for this special value (and also 0, just to be sure) and filtering it out. This is a work-around
-+         * only however and something AMD really should fix properly. The Linux kernel should probably work
-+         * around this issue by turning off RDRAND altogether on those CPUs. See:
-+         * https://github.com/systemd/systemd/issues/11810 */
-+        if (v == 0 || v == ULONG_MAX)
-+                return log_debug_errno(SYNTHETIC_ERRNO(EUCLEAN),
-+                                       "RDRAND returned suspicious value %lx, assuming bad hardware RNG, not using value.", v);
-+
-+        *ret = v;
-         return 0;
- #else
-         return -EOPNOTSUPP;
--- 
-2.22.0
-
diff --git a/sys-apps/systemd/files/242-socket-util-flush-accept.patch b/sys-apps/systemd/files/242-socket-util-flush-accept.patch
deleted file mode 100644
index 4849c4c0789e..000000000000
--- a/sys-apps/systemd/files/242-socket-util-flush-accept.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f3d75364fbebf2ddb6393e54db5e10b6f6234e14 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 18 Apr 2019 15:13:54 +0200
-Subject: [PATCH] socket-util: make sure flush_accept() doesn't hang on
- unexpected EOPNOTSUPP
-
-So apparently there are two reasons why accept() can return EOPNOTSUPP:
-because the socket is not a listening stream socket (or similar), or
-because the incoming TCP connection for some reason wasn't acceptable to
-the host. THe latter should be a transient error, as suggested on
-accept(2). The former however should be considered fatal for
-flush_accept(). Let's fix this by explicitly checking whether the socket
-is a listening socket beforehand.
----
- src/basic/socket-util.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
-index 904bafb76f9..e787d53d8f4 100644
---- a/src/basic/socket-util.c
-+++ b/src/basic/socket-util.c
-@@ -1225,9 +1225,22 @@ int flush_accept(int fd) {
-                 .fd = fd,
-                 .events = POLLIN,
-         };
--        int r;
-+        int r, b;
-+        socklen_t l = sizeof(b);
-+
-+        /* Similar to flush_fd() but flushes all incoming connection by accepting them and immediately
-+         * closing them.  */
-+
-+        if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &b, &l) < 0)
-+                return -errno;
- 
--        /* Similar to flush_fd() but flushes all incoming connection by accepting them and immediately closing them. */
-+        assert(l == sizeof(b));
-+        if (!b) /* Let's check if this is a socket accepting connections before calling accept(). That's
-+                 * because accept4() can return EOPNOTSUPP in the fd we are called on is not a listening
-+                 * socket, or in case the incoming TCP connection transiently triggered that (see accept(2)
-+                 * man page for details). The latter case is a transient error we should continue looping
-+                 * on. The former case however is fatal. */
-+                return -ENOTTY;
- 
-         for (;;) {
-                 int cfd;
diff --git a/sys-apps/systemd/files/242-wireguard-listenport.patch b/sys-apps/systemd/files/242-wireguard-listenport.patch
deleted file mode 100644
index 39b3c7c0a54c..000000000000
--- a/sys-apps/systemd/files/242-wireguard-listenport.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a62b7bb79e9a2aa683624c32cde1c756d8466fb4 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 25 Apr 2019 00:39:04 +0200
-Subject: [PATCH] network: fix ListenPort= in [WireGuard] section
-
-This fixes a bug introduced by f1368a333e5e08575f0b45dfe41e936b106a8627.
-
-Fixes #12377.
----
- src/network/netdev/wireguard.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
-index f3084c0773f..5ebc5dfed84 100644
---- a/src/network/netdev/wireguard.c
-+++ b/src/network/netdev/wireguard.c
-@@ -452,22 +452,23 @@ int config_parse_wireguard_listen_port(
-                 void *userdata) {
- 
-         uint16_t *s = data;
--        uint16_t port = 0;
-         int r;
- 
-         assert(rvalue);
-         assert(data);
- 
--        if (!streq(rvalue, "auto")) {
--                r = parse_ip_port(rvalue, s);
--                if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r,
--                                   "Invalid port specification, ignoring assignment: %s", rvalue);
--                        return 0;
--                }
-+        if (isempty(rvalue) || streq(rvalue, "auto")) {
-+                *s = 0;
-+                return 0;
-+        }
-+
-+        r = parse_ip_port(rvalue, s);
-+        if (r < 0) {
-+                log_syntax(unit, LOG_ERR, filename, line, r,
-+                           "Invalid port specification, ignoring assignment: %s", rvalue);
-+                return 0;
-         }
- 
--        *s = port;
-         return 0;
- }
- 
diff --git a/sys-apps/systemd/files/CVE-2019-15718.patch b/sys-apps/systemd/files/CVE-2019-15718.patch
deleted file mode 100644
index 8186f7096f82..000000000000
--- a/sys-apps/systemd/files/CVE-2019-15718.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 35e528018f315798d3bffcb592b32a0d8f5162bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 27 Aug 2019 19:00:34 +0200
-Subject: [PATCH] shared/but-util: drop trusted annotation from
- bus_open_system_watch_bind_with_description()
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1746057
-
-This only affects systemd-resolved. bus_open_system_watch_bind_with_description()
-is also used in timesyncd, but it has no methods, only read-only properties, and
-in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and does
-polkit checks.
----
- src/shared/bus-util.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 6af115e7aa..821339d4ae 100644
---- a/src/shared/bus-util.c
-+++ b/src/shared/bus-util.c
-@@ -1705,10 +1705,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
-         if (r < 0)
-                 return r;
- 
--        r = sd_bus_set_trusted(bus, true);
--        if (r < 0)
--                return r;
--
-         r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
-         if (r < 0)
-                 return r;
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 540f7dbef65c..d62c5159c4bb 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -21,7 +21,6 @@
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="importd">Enable import daemon</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
-		<flag name="libidn2">If IDN support is enabled, use <pkg>net-dns/libidn2</pkg> instead of <pkg>net-dns/libidn</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="nat">Enable support for network address translation in networkd</flag>
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
deleted file mode 100644
index a60baf3e919d..000000000000
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${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"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="System and service manager for Linux"
-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 cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131: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}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# 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]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~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
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/242-gcc-9.patch
-		"${FILESDIR}"/242-socket-util-flush-accept.patch
-		"${FILESDIR}"/242-wireguard-listenport.patch
-		"${FILESDIR}"/242-file-max.patch
-		"${FILESDIR}"/242-rdrand-ryzen.patch
-		"${FILESDIR}"/242-networkd-ipv6-token.patch
-		"${FILESDIR}"/242-network-domains.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	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
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-242-r7.ebuild b/sys-apps/systemd/systemd-242-r7.ebuild
deleted file mode 100644
index be69471c9e6e..000000000000
--- a/sys-apps/systemd/systemd-242-r7.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${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"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="System and service manager for Linux"
-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 cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131: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}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# 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]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~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
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/242-gcc-9.patch
-		"${FILESDIR}"/242-socket-util-flush-accept.patch
-		"${FILESDIR}"/242-wireguard-listenport.patch
-		"${FILESDIR}"/242-file-max.patch
-		"${FILESDIR}"/242-rdrand-ryzen.patch
-		"${FILESDIR}"/242-networkd-ipv6-token.patch
-		"${FILESDIR}"/242-network-domains.patch
-		"${FILESDIR}"/CVE-2019-15718.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	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
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 7a34238c668d..28bd768a2158 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -237,6 +237,7 @@ multilib_src_configure() {
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
 		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
diff --git a/sys-apps/systemd/systemd-243.ebuild b/sys-apps/systemd/systemd-243.ebuild
deleted file mode 100644
index 2332516c1aa4..000000000000
--- a/sys-apps/systemd/systemd-243.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${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"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="System and service manager for Linux"
-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 +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131: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}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# 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]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~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
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-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
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	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
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	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 "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# 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 split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
index c9bb54c4b819..daed59e210c0 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -236,6 +236,7 @@ multilib_src_configure() {
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
 		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index c9bb54c4b819..daed59e210c0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -236,6 +236,7 @@ multilib_src_configure() {
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
 		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index f0687c0c7b19..bf4bfd9bb3e0 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,6 +1,8 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
-EBUILD the_silver_searcher-2.0.0.ebuild 921 BLAKE2B a894dcf2551666d64fe272312b66d471467d19c75f3ded366639aec84064c96b4f42ec5e2e0c561d75c328642bf877fff767171272400987ef80dce8844fe150 SHA512 1b44f0ff304973c569e994972c1a2d0f81c2be0393f7883f3125b8f217360462cfb6c133a79cbb45a9766cd1ddd1f29ce4d598321c1fc02b094136bc24f297b4
-EBUILD the_silver_searcher-2.1.0.ebuild 993 BLAKE2B 3b0cebde2a8b2ea61587d5bd01acc580dbed12182e1a037113d398b5f962bae9175f888f0463bdfefcc76e77ce44894c576bd70b74e2ced5818e310b1d8ddc8e SHA512 5cb04b75de6b34bc2b26ec738084fa606287967211cc9890bcc55ec3506b995afba9dd53e5419e3af611400bb2198e69cf32172b8d9dd0227877d9b6bc086cb6
-MISC metadata.xml 263 BLAKE2B 3d3cb735ca3d3b8c9ea8ca6b1d9adcb3739a33cce36af48db9e95b673c5e1d7b749148ceb39c57c74819d18f33f510abc41354c0c0c2a502afd611e3a2b0ecdc SHA512 96e459d527c00e92aab5ea5ebe3d078d8b505a3e9d9ab92878132f58d82cad6b1d3199d95cc96bb67ed9a9ea05a06ff31666feeac0fd2bcb71f2035d5e00eee5
+DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
+EBUILD the_silver_searcher-2.0.0.ebuild 938 BLAKE2B 330c2b8aa97db09698e066d58972f12d007c4827d78a88d0d727ec837aae8166c67f387b8566bf484b16c6e8114564386ae43bd2447585f74f97d21fbfd5f590 SHA512 86652ef0807858107f43ab1134cc323f4826c352590b318b42357ce4e46a86aa72b238ebfe3fe075b6dffee4ed12211c648d54a0b5a6ca64ec0026151e3c70ea
+EBUILD the_silver_searcher-2.1.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
+EBUILD the_silver_searcher-2.2.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
+MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/metadata.xml b/sys-apps/the_silver_searcher/metadata.xml
index aeaf98a5fa65..8395d00a1c03 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>wraeth@gentoo.org</email>
+    <name>Sam Jorna</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ggreer/the_silver_searcher</remote-id>
   </upstream>
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
index 21b02d12de35..d993a7bb70b8 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="dev-libs/libpcre
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( dev-util/cram )"
+	test? (
+		dev-util/cram
+		dev-vcs/git
+	)"
 
 DOCS="README.md"
 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index f8bf1e852265..f6cfa25db0a5 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools bash-completion-r1
 
 DESCRIPTION="A code-searching tool similar to ack, but faster"
@@ -19,7 +19,10 @@ RDEPEND="dev-libs/libpcre
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( dev-util/cram )"
+	test? (
+		dev-util/cram
+		dev-vcs/git
+	)"
 
 DOCS="README.md"
 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
new file mode 100644
index 000000000000..f6cfa25db0a5
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-util/cram
+		dev-vcs/git
+	)"
+
+DOCS="README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+
+src_prepare() {
+	sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lzma) \
+		$(use_enable zlib)
+}
+
+src_test() {
+	cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+	default
+	newbashcomp ag.bashcomp.sh ag
+}
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index 7a1bc1d82d31..d2404f45f1c3 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -1,5 +1,5 @@
 AUX thunderbolt-software-user-space-0.9.3-cmake.patch 521 BLAKE2B ca7756afc0504e0d9df159da7db7e6d334e271fcf404f0700e66454de71cff17cb0b32970cab0569582a32a40739eefb82ae64ea9cccc5657588b9b9ea11c149 SHA512 b34a3833eaf772cb07540199a2096af88cc02aacefaf45ac0a8f91abcbedb0e499c587a5e241fb5f7cbf334a4aee80cc1416aa775bc69480e3a5bd3497cffa9b
 DIST thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz 1160 BLAKE2B 2710f2acea71a7301a121a564bc7625c73b7c983622f9d50f544836facbda7c8cbc29055c81706ec0d8fe5aaa8d254872f9c9740b2b9235642b1264380ad17c1 SHA512 3a5b5e5bfc6b7e2a0f2cd09428e315d6895a217bfda7faacd3817e85b3201192f6dd6b26d10071721164bb9c49731aead1d8249ad6652fdba9d38074fcb74907
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
-EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1049 BLAKE2B 9d32b18873b52ab1ecebccdbb0f554f081916ad8036cc2f4b8d29d046fb2ed41631a80dbc670b23e6de15774a7aa671e47c2f8cd2b945e926de057588535fdf9 SHA512 856c4a1bc7badc869a2dd77e8fc5118e142be66b23682bcdcccedafadbfafc26fb627405561f7c9137bfc757f64375d01cc6459238c27d6af332fe12dbd5d55a
+EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1031 BLAKE2B 6ae85474d7ca2eff7c2b522b40b57af6279ed10988199cbe35f50c26d276c21b422ee8f750d6d492aa66376fdb35f2c541fecc66cdc6665211d712d248f28f10 SHA512 3a92e3138aeb8ac1262af5324201bae6b48e820c8fb1109e66c26553a2534bd90a42f67155bf89abb29a182db679aee156ea2e8f262da02737531d13c98f4c9b
 MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
index a1d2016e4d4d..96a4641a9fb3 100644
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils linux-info
+inherit cmake linux-info
 
 DESCRIPTION="Thunderbolt(TM) user-space components"
 HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
@@ -30,11 +30,11 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	cmake_comment_add_subdirectory docs
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman tbtadm.1
 }
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index d2436a8090a5..6b9ef2639400 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -11,4 +11,4 @@ EBUILD usb_modeswitch-2.2.6.ebuild 1617 BLAKE2B 216b3c94b7f204ee41fc36f95e5a3b63
 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
-MISC metadata.xml 541 BLAKE2B edede0ecefedff47ad5641a9661eb7d192f339ae48f7c562309412a545f4e3897a4dfd521e56c8f906326578fefe1e489905be98df240a240944c4c2520ea4c2 SHA512 a7d85ab85e65702c21bb6235e55482a678fa3e990c0b75f147b91970286784e26f7aff11b6538278ac51ce7003f7e55cc8a0bc51ede9f219354c7e5693dad80b
+MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
diff --git a/sys-apps/usb_modeswitch/metadata.xml b/sys-apps/usb_modeswitch/metadata.xml
index 8cf6d89f163c..1b2d98603b73 100644
--- a/sys-apps/usb_modeswitch/metadata.xml
+++ b/sys-apps/usb_modeswitch/metadata.xml
@@ -4,11 +4,7 @@
   <use>
     <flag name="jimtcl">Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
   </use>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>freedesktop-bugs@gentoo.org</email>
     <name>Gentoo Freedesktop Project</name>
   </maintainer>
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
new file mode 100644
index 000000000000..df38e4a4dd87
--- /dev/null
+++ b/sys-apps/usbguard/Manifest
@@ -0,0 +1,5 @@
+AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e
+AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
+DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
+EBUILD usbguard-0.7.6-r1.ebuild 1939 BLAKE2B 1aa5a2b004220759ee7183279f94dfb1132f97da5d7507208f6c69ae932b68ab1385ba9da78f261e9de9f01a4d756ec810b8ddd6b7646ef2875f1dfecd3decc8 SHA512 8685e97b343b13291a28aa0372e1f85cdc288e59b969488bcd88c4c161a1837de1da3f8da5925eb49cb89f6ab8d9cb6c20a3214ef62d23d25ff9f769baf1c4a2
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
new file mode 100755
index 000000000000..2c923123c186
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-dbus"
+command_args="--system"
+command_background="true"
+pidfile="/run/usbguard-dbus.pid"
+
+depend() {
+    need dbus usbguard
+}
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
new file mode 100755
index 000000000000..3ea514cce169
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-daemon"
+command_args="-k -c /etc/usbguard/usbguard-daemon.conf"
+command_background="true"
+pidfile="/run/usbguard.pid"
+
+depend() {
+    need udev localmount
+}
diff --git a/sys-apps/guix/metadata.xml b/sys-apps/usbguard/metadata.xml
index c5298995d2d4..6d2298876faa 100644
--- a/sys-apps/guix/metadata.xml
+++ b/sys-apps/usbguard/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..ec5fcfb642d2
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit systemd"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+CDEPEND="
+	dev-libs/pegtl
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	dbus? (
+		>=dev-libs/dbus-glib-0.100
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable systemd)
+		--disable-dependency-tracking
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${P}-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${P}-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest
index c7244def4544..ebb542f4c29c 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,6 +1,6 @@
 AUX usbmon-6-sysmacros.patch 1103 BLAKE2B e4ea9107680a108dcc15e9b53eff87dc3905b4f799335ec560d4905ecb3c848d3b8a5aab361f6602c4545d5549303d14423d75402ac4bb959737e8f7c44c7aa3 SHA512 e3a1b55effd247ac8911c07220c187bc099db011269608d09a8b6698670b5e3d1c34a8cd60acdbfd69ae3bae24ab4cdcb69927b4c9b8c573bfc7045c5e3d1a0f
 DIST usbmon-6.1.tar.gz 16358 BLAKE2B 94e7793c6ce2ef6a8616f04871efbf22c388c569834c34869d51bbf3138c4c0ce89adaaaba19fc70a2371e244a99c7fe365f360530b9366a339be3cbf291f6cf SHA512 580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
 DIST usbmon-6.tar.gz 16796 BLAKE2B 14faca99b44a1d9aa33217f75633251a7932d57732780ba6d871d2dee1b48202071186704959b623f8afc276e9e7da5e4d11204b40f567057cfa731d851cc413 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5
-EBUILD usbmon-6-r1.ebuild 628 BLAKE2B 6e2391367a4a5bf302278e37d97d223a225b3d79a7f9398fdaa86f79a9f89c92d6d735d5cab88c220a0e414a093294ca63cbd1381f255f867961c3859c3cc923 SHA512 930a9f554c96c7a04102a8f32b974d7f13c9abb1fd247d3ec4ed2918d551a89d1690554e6c4e4dc0097ebecab52ef317a61aa794e79ad734dd536418826cc5e6
-EBUILD usbmon-6.1.ebuild 500 BLAKE2B aa58a17b4476e5ae32f1febec2cc5b167da2d03d20c7a5e029fa52571a7236426918be86d12d848f57277fcc4c60883d0211f7cae499e140bbcbaf8e900ff02c SHA512 44e10b16a8617e6a6bab7ec976db9be673e5039b96476338c8c25af5be86d9a09d4d9d9456f2aec916d74360fecf4f1bc4946c613d1cedcc8ce697a8a74f9616
+EBUILD usbmon-6-r1.ebuild 656 BLAKE2B 4b9449aec5c6dd45f3f2991da4f28779b8ef8c8cd540522bf270a9c4e504f6bd73432e98d3d63f1894d4fa7bb09c7868a15728043ec29525d60b6b235172aa9d SHA512 20757b54e475de2acf247015d8868b74bac3a02aeb7db9e79791e230ec6bc41f0030348b2598b33843e1973b803aacd10fcd8baa831a0cb1d1adcf8ff83a89ab
+EBUILD usbmon-6.1.ebuild 528 BLAKE2B 6726828f9ddd1803f781a1cfa05781d2e6fcce89f32b91587f860889ccbea9532b0bf8c35b13748d1ea3b50c817df1d28874fdb6596c8e6fee9c4aa013a59c0b SHA512 483b32be26746f18f9d7ab9ffdd3311cd5e7f680dc0eecf906bc46ad737c5ab5a9dc9405cd0ab59a0206e0db588a64ce9101fd3db3dd61aabc0bff90b10c3dd1
 MISC metadata.xml 222 BLAKE2B 5000e095f9389a9ea81b6ae970f1f1587ce12f13fb4ce95ca82be803b45d9553af4c13f5ceb47eaefc780dd6be374c8b905d12aa84179ad7b58aea44c5bf1927 SHA512 05134582b0d0287f20fd3702d042ca556dc42f3ca4568bfa73f6d9886ed8027057936af758ffbb252a5677e1af876c46e8d044f5fc691148922c5fa0c5cddc03
diff --git a/sys-apps/usbmon/usbmon-6-r1.ebuild b/sys-apps/usbmon/usbmon-6-r1.ebuild
index d2f0f68e90a0..481dbb064701 100644
--- a/sys-apps/usbmon/usbmon-6-r1.ebuild
+++ b/sys-apps/usbmon/usbmon-6-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="https://people.redhat.com/zaitcev/linux/${P}.tar.gz"
 
 LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
diff --git a/sys-apps/usbmon/usbmon-6.1.ebuild b/sys-apps/usbmon/usbmon-6.1.ebuild
index 87a3aba5aaa8..283ddd138205 100644
--- a/sys-apps/usbmon/usbmon-6.1.ebuild
+++ b/sys-apps/usbmon/usbmon-6.1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="https://people.redhat.com/zaitcev/linux/${P}.tar.gz"
 
 LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 1b67c32e74f2..15b2d80107e3 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -3,6 +3,6 @@ DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc7786
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 EBUILD usbutils-009.ebuild 1140 BLAKE2B 0e8be2788d8f14490f08ae83ef7740738e19203eecf89dd53d2f30ed75b45e1cb7570cf283bcb32a42ded6d23eb3613bcd5d7052281b37f6ed2fc64bad5da27f SHA512 8657c8d361378bde0427ce70cad0e11e6b7a9cad008722a569b6d6078537ede5fb9d45509b647d5727738ec6796164d4fc74c1614f89c3599d03050fc49ff5cd
-EBUILD usbutils-010-r1.ebuild 1242 BLAKE2B f7402903a8336bf3bc76ff07a184aa05b87ddb2ccbe2fbc769d95e087e62f9b0454bdc76a7c90e6a68c549b0bec0abfffb99f0c8ebbe7a0a4bb4f129f7900e41 SHA512 36f249196bb0e3cf5f567b1f8a91d0bc67f6b124abb576c3be7060447c88f43be183a7325cf94150c11d7af2cf1477a568e4fd13a06fca9d278c1ad0ceb6814b
-EBUILD usbutils-012.ebuild 1211 BLAKE2B 49c1706d14608197cf1851113dd39a32630a18ecaa7bf1b196021215617454f2883b5f7df171f26e5101ff0ca11fce12700ba3120d906e7f55dfcb5f7b344d75 SHA512 24a21df8f1e5166598de86cda62f9d2aaa27821e0bbad038ec947e1ac56a0fc5573140406fd2929f7b31518868da90bfc79aaddbac74275652a078a78e44daa4
+EBUILD usbutils-010-r1.ebuild 1240 BLAKE2B f1529dec9f0ba9d221a16539301bdbee5d3b1a1e8a01b2279decdf84c9627e65306d1c754692c258260fd95cc0dc121f3ea6e1970dbf2b8f4b6a0d7df83f4d01 SHA512 ac732e64835f238c9e2ec04b90115b20452dcf236e78ade250146b3d70e62711691ee9ebff21305bdb6df0e05bdcd4b463b3d87bff786835ed3f78c40babd4cc
+EBUILD usbutils-012.ebuild 1209 BLAKE2B 525c92c7a2608b979c74b673c7a53d39d7cd8f38a00821bde0e97ce10a8710b829d2abe99e907f4d247f7b6d17ab4848950e06d279e6d1cfd524ea4848c5eae2 SHA512 4f98c4647320057b479d203233b9a3ec189beec1a66fa3fac0ac199e053b2707858ed81c5f47b9d0700033885024fcb65a04f9ead07a07f2cda0ad9c30632e2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 03bf90961beb..d12db82c7905 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index 3f31a7e5751c..b426a3157d3b 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 269902b27fed..4499be336813 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,9 +3,9 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 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-rc1.tar.xz 5125036 BLAKE2B 099c5ba1f8111b9ba006f77f2e650b7ff8e0607c0b8e9e59efe4d3b6f47a380b9c87ff28c71e312749ab6073cfa4ef1ac97953510a62fc9ea16ab0d42458ad6a SHA512 1ecf0b6868409dad4a2cc6e7fda708b8bea939f0c2a02b97068d114dac316a3d27c27542e2b220fc4ebef307d6c78b4f318685c1b7877429689f794cb2d4dc7a
-EBUILD util-linux-2.33.2.ebuild 8608 BLAKE2B 9eb0021764bf8b3165fc19a4b3783d1f1b5d2cc58f7ed20978e8fa03d0672d6fa171f1ad0978abc59df0c72601f1d3eb2436a32c980ff3eccccef57ea5cc714a SHA512 9deebde0f602c6eb539356f5b4be1eb32fba2416c4d8c36b3657a0daab607d9c30451644a3170343324c1d63fdf21b9a4911cc7c49baa5129cf337670069c789
-EBUILD util-linux-2.34-r3.ebuild 8629 BLAKE2B 86cd3984a447301749d70b91d3e0b5dfc74fc7c595551ea23f72c90468973821befe239157e6e6356597f0f535343908765d4cc1f47e2911c01d7308cf141fcf SHA512 7c72f77525dbf5ed217545d82994efbad5bb262b9ccd821debcb0c35635e00066d5f344eab61fbb40a158ec9cca834d09f2cf8b0e38de1c9bd902fad89e01bbf
-EBUILD util-linux-2.35_rc1.ebuild 8701 BLAKE2B b342903e4bc36fe2e6179eb0457654746eb8af6846209795699e69cf08863a3485683ffaa5bf0a67df78bd8fce8af834ef3e3064906ea5e02fee82cc6a924377 SHA512 6929033a0bf3eee76d636d4e2478c2c55f38352b43c67b9fba19253439ab9c7ad364aa5bb45f25b37068b1c4ac5bac4bf420b55998e57ebfb72c3f3efba1edc7
-EBUILD util-linux-9999.ebuild 8701 BLAKE2B b342903e4bc36fe2e6179eb0457654746eb8af6846209795699e69cf08863a3485683ffaa5bf0a67df78bd8fce8af834ef3e3064906ea5e02fee82cc6a924377 SHA512 6929033a0bf3eee76d636d4e2478c2c55f38352b43c67b9fba19253439ab9c7ad364aa5bb45f25b37068b1c4ac5bac4bf420b55998e57ebfb72c3f3efba1edc7
+DIST util-linux-2.35-rc2.tar.xz 5175312 BLAKE2B c8e67e7f1a7f3bb20b7b9712aa18add987daa7cdae69ee97216f2952e5f034bd0ddfe8672ef518ceb1bc9834b1d1075dbd992027dda6abe30d5adf2bd5260d8f SHA512 7c59608ba64f9fb377d350dbed9ac332707537d862dd13da65be95b0837b2da7ca54c111dad05b08f08563ec32eeb117f27ce10c904bc7a56f7c7eca4ac1a754
+EBUILD util-linux-2.33.2.ebuild 8561 BLAKE2B d198b040f7d3639789cc92a5895a9d24cb80cf2c573dfe3d2615ebb47634ac1c0a4fe75d7237a1bb9e726f13ac9f3a47447c68c597c149b99ff868d89f9a0ab7 SHA512 ee74ec1ee4b8cfc3f626aa48dfc412407889d19d4b767c4939f11f8a94dcadea13d24bf95ebdcd50396a7aeb092806426d1a7b09098c5c1f71a84a22e319dd03
+EBUILD util-linux-2.34-r3.ebuild 8582 BLAKE2B 4e5c1b1df64d8dedbbda93e8d2623e2c63c0f0a89ebcf64a1fe0ea7d540d9687de6f7a4b2b95a28bec035d5126f1fcbde9423d157f57980d3c34903048aa896f SHA512 8b9cd0afd11cf3edf5383cdf9c231f0b34d19b0d18987f054989a30a84a65473ba5367bad2e28e30784510d73f86ba5895338d83f4c5456612f8391313ae9212
+EBUILD util-linux-2.35_rc2.ebuild 8656 BLAKE2B 2b8907e68321eaa60d86e2a32d08db56602e673fc2c9f028183da3e292eee88f433509056a7fd962fb275719d63c3038226353f2f50a929aab9d80c0969265c6 SHA512 bdfbfb5c6939e7d25a5edb13a14491f592f967ea89b2d2c1c0b288fe7318d9cbdf721d07afbe8d9a2e4228c53d3c4fc75a2172dc1e3f934ff6782b3378ccce4a
+EBUILD util-linux-9999.ebuild 8656 BLAKE2B 2b8907e68321eaa60d86e2a32d08db56602e673fc2c9f028183da3e292eee88f433509056a7fd962fb275719d63c3038226353f2f50a929aab9d80c0969265c6 SHA512 bdfbfb5c6939e7d25a5edb13a14491f592f967ea89b2d2c1c0b288fe7318d9cbdf721d07afbe8d9a2e4228c53d3c4fc75a2172dc1e3f934ff6782b3378ccce4a
 MISC metadata.xml 1260 BLAKE2B c68fc8a1ab1ed6a5e8e8e09571adab4f0e6c539c7ce45434730d0bf7c039cb886b1a5273f0b41d5c00cd7188143aeedba9be70cd4eaa024f4e71503dc7f88e6e SHA512 701f00691c6fde1fcd3be15e9daa2c067f3b676b80a05d5131bf39ef111d652ede31bf2c45db1dffdfd81e523983a85ea96ed9b6ae0fd645b2203ac5c3afb508
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index bdcb82f80944..8e0e60b9c32c 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -92,12 +92,6 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
 	elibtoolize
 }
 
@@ -143,6 +137,10 @@ multilib_src_configure() {
 	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
+
 	local myeconfargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
 		--with-bashcompletiondir="$(get_bashcompdir)"
diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index 666d96fe4d15..18ce20510634 100644
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -91,12 +91,6 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
 	elibtoolize
 }
 
@@ -143,6 +137,10 @@ multilib_src_configure() {
 	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"
diff --git a/sys-apps/util-linux/util-linux-2.35_rc1.ebuild b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild
index 212d66fe2dbd..7c868feaa8f8 100644
--- a/sys-apps/util-linux/util-linux-2.35_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -92,12 +92,6 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
 	elibtoolize
 }
 
@@ -144,6 +138,10 @@ multilib_src_configure() {
 	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"
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 212d66fe2dbd..7c868feaa8f8 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -92,12 +92,6 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
 	elibtoolize
 }
 
@@ -144,6 +138,10 @@ multilib_src_configure() {
 	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"
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
new file mode 100644
index 000000000000..2da21c13c317
--- /dev/null
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 544 BLAKE2B 3933580d7434b8dc1fad0a55b1c3deefe13a4f20366398cb441b0df0f029a72407fc92266cfcb288b64470ffaf4bae6fcd1fcbe42451274f08a2e43708fe17ff SHA512 ab375ef6345eb7de1df08c8fb4d4e8beb9ce97c2a75149fc622613f3c070a5e09b48c277fc83dc1fdec7d8a7ea52a46bc536184699ae0271877fcefff08a4811
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/metadata.xml b/sys-apps/xdg-dbus-proxy/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/sys-apps/xdg-dbus-proxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
new file mode 100644
index 000000000000..705b24af5e4b
--- /dev/null
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Filtering proxy for D-Bus connections"
+HOMEPAGE="https://github.com/flatpak/xdg-dbus-proxy"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf --enable-man
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index dd4532a2d589..d828e916c200 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-1.4.2.tar.xz 421660 BLAKE2B 5395218fa182947c589ff51cd43b838591e47442b23c4fe0719f0970bff3602e81c4f79ad93890bde97a529ca34a733032e85a1f21f41e9aa230d5c2d40e1136 SHA512 9a19dc8f6899a24f8827ce36447316ce74f293abed469be24adfaa16d18deac0b7c5d77f744eed9b540b54cd23145281dacb6811dc52b34180b21d6dc02efc5a
+DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 EBUILD xdg-desktop-portal-1.4.2-r1.ebuild 1000 BLAKE2B 006ae8d4a91bca6f934eafff31a33f049d6652ab64a3e76ba8c2b9c3586dbe62333c9b1e9171f5d5da67ff0406ca9a12ce3fa075182bfc7c1ee19f9e1a55a565 SHA512 234bd5de3bbbe5e6a4dc4b1514f7a1157812eca3708a31cd1f84e37d6cc92d80d1fa13a5c1524c18474fe152b74eaf823c90fed968dc10c3d7aa36e97feb9e30
+EBUILD xdg-desktop-portal-1.6.0.ebuild 1040 BLAKE2B ab01c21d3f907eaf1bb9e1f7a5d94c2f2160c186676cee10a754b0516ae7a5669a6dac44c1dd3507addd55a50561ab36d868acc2536a7bc42585eaedd67cad50 SHA512 b2895c9c6039905aaacdb27d49f81c5bc237d06b99dcd2eba86d08beac0de37b753df8dc7f31e70d1ec40227a4401816904b1d6c5db42d19950efcee1ac2e1aa
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
new file mode 100644
index 000000000000..83e57d114bf1
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+DEPEND="
+	dev-libs/glib:2[dbus]
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( media-video/pipewire:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable doc docbook-docs)
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index a87c0250a770..f14099ad196e 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -12,6 +12,6 @@ DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r3.ebuild 1562 BLAKE2B 07946cd1b48641748df2ea7935d8bb3ae81815304d13a86ff2cc3f1d1ff787c89c9ae02b42655c1b824fa34aea3e413072aca4bf9fe725e2c7b148cf018e1062 SHA512 1adc51b66e02f15f530a70a3cb4eb7756e5bdad8260b84302a779ca4a861bfd9fd919fb5f44c667db2f18e8f376122e3082ab59d2c3e30db81c67ad9465383e8
 EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62
-EBUILD xinetd-2.3.15.3.ebuild 1043 BLAKE2B 1a20f41890bdd5cdbf87e0037240340e7a7922b3a79bb736df25df731d17512976cf9d7e48ccc1f4382fe64ead5c6d614141e089db05fc3823d15f94a5613279 SHA512 837cb66a769099873c3e2702883fdf69d228b402b9c4f46bd85e08cf3fab60f1e06a8f0dbdf78d77d1779befcee8c41c1ad2f0567db1509a0973819035b3d838
+EBUILD xinetd-2.3.15.3.ebuild 1066 BLAKE2B 84213fb34e4b1fc1ab9e96b54d06e9cb84b3933934b70de0c41b89b31f3dcd4b445c31f22abdd957b2c349314475a7afbcdfb09db9544f0d870a898cee71896b SHA512 2ae4466cf9541e7c7fa80763800daa95b387f48952ff131b1c0b661c0ed7e1b6e9fce9e0711ec13b62d3a98c0da18fc966008ad1beecae3ec1505da6b348776b
 EBUILD xinetd-2.3.15.4.ebuild 1279 BLAKE2B a98a6f9bca2a0fd7b758d6d95eb65daa140037d8786012e06b21a61d781dae7dfc1c9d214d1f936b713f72f3083d444a3558312bb2301c622c0f4972d7d498b3 SHA512 72245d9fe374be1499dd20f99f0534b262d8fd22b990aacfe3217842dffe3e4f975280728e9bd0d8facfa6539855ee9e1f343af8faa4ffe7570b545bb63a474c
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index ccc6459905d9..6206114a75ab 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -6,7 +6,7 @@ inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="powerful replacement for inetd"
 HOMEPAGE="https://github.com/openSUSE/xinetd"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 7623aca785a4..3d4716923bd7 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,21 +1,5 @@
-DIST yarn-v1.10.1.tar.gz 1107068 BLAKE2B ce9870d5f149b53d056682190a4bd3bcd2a8d2c30fb06f053626f55db506100f9db212103c3f498b44a53f94dfa0b5c4ce37453d72e05533476ff6a2d99a4099 SHA512 107d07d5fc9f171904e14a46e1bf9509a558e08e3cf08d84c903661a31862a6bec4886f41b76fed4871f1983c8da0a9ad5dbb8de0e190378c7f1f5e5abaa15c6
-DIST yarn-v1.12.3.tar.gz 1166553 BLAKE2B 8e0c56c46522eeccaa558dd1fccdca40e83d03dc0ec04a58541b318b73bb64b9559c6f210a2745cc07a87234ef7857a1cc8a57d1f22277a8b6a90026f8c563d3 SHA512 f1fe6b58d0ef9210260b19a7f02d0bb0d58cc536159385462a2ab4b0807a1c66636994c7b06207f3b4949950d411dd96939e1ba8aa1495b55681014242146457
-DIST yarn-v1.13.0.tar.gz 1169613 BLAKE2B 5fc730c0b456d67702ef5305223cfd933c4c8f1d13364ff383294f8ae2b7b3f400476ff32b9aa0b27c497116660ea295691831e4e9bf50cb699d03d2dcd99e6e SHA512 5277f0d9e79fbfc8a6b7864c3e1bc554fe38582cf7f21b83c641ecf98aabc78c014caef94ebd26877578ae1fb6370e6242ad2b70cfd569fa2d099a3da936f90c
-DIST yarn-v1.15.2.tar.gz 1169927 BLAKE2B 1ebf899b1f34dd3b6fea4fa001b1edda62dd4c8964099b8a1bc858a1b28b7ccbab3aa3e229bc7882892763db414ed4f7cfbe2deb636d2a8675da87df1754a835 SHA512 0e1a9a19ed8571829db8ee36776841c9793bcbc936938d87deecd875604c4ef70d72058ac7bc429095ac540422917bda1103761b224daf3f026e8a9499a051af
-DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 1dbb754ae0af3b9666bb03057f587854407b3587fc4304e8282c759d5ea0cbee12eed58e526808893d3cf8e29c4ec69b13a28acccc6f6908bcdb8c9126d1a408 SHA512 71f7a6c8696758a035ce8a5452079b4cf7fc0b85a43c867e4c99a4970704009e2eea858fb49780cebb1a99a18687ff9bd5759ef16e75cb3008982e0059b591d6
-DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6 SHA512 0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84
-DIST yarn-v1.19.0.tar.gz 1242633 BLAKE2B 55aacab6e44c0a44f39ef9e116444043784272ab3d328f44e818cc45a94203f6e73a6d66f51dbdec46a0694890817dde3148be0fc3c931de79c0e2164f5e755f SHA512 40b88ca23f991e8da44f5ef1d6dedeaceea0cd1fbdc526b9cfb2e67a2d6a60cd528f7ef088816febb910707fa792c86c3b47f4dc89970a57e410a5209ec32b79
-DIST yarn-v1.19.1.tar.gz 1243585 BLAKE2B 01d19b9e2dabf40988b8dac9b3b48a43e7f15d0e4a3f75aad40afb8c811d6387bc476dbb7c6c841af33fe6010b98eaa4969b32cd590f9092b7552e8e9a152960 SHA512 8019df6cbf6b618d391add1c8c986cfec8aa4171d89596a54e32b79d79f640edb4c5b90814fa1bf8b947e3830be3b19c478554f7fd9d61c93505614cd096afc7
 DIST yarn-v1.19.2.tar.gz 1244018 BLAKE2B f88d0b6c5c3bdb6e02c0dd8c36fa981d35a0e46da143399dbbd8a39fac13669dc1b459f3ecd192c99d767fc477f54e61d74caeafaf9d1f0cdfdc4fba0b405fb6 SHA512 39d2cdfcafec03e2a75b8820350c0760ae9825d2e4496c5bc7a21877e588409eb10df93c08860a72405fc06c530660da125b96b3cdc89f38c50a652a3eda58fb
-DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f SHA512 1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b
-EBUILD yarn-1.10.1.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9
-EBUILD yarn-1.12.3.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9
-EBUILD yarn-1.13.0.ebuild 982 BLAKE2B 095496de5e6d36be1f9323bb69bbb40f60bd17ad7f8351329b6ee0bceb28dfebe0a8c17fb0d63d12e3cea375f26a15ee51b9463c7b5f1c1edaa46a5e7a61eb24 SHA512 aae6d0d508bd30834b2e7a0d6b180cfddcc995292dea6a0c7ed15713779d32145a86cbec20e6a21e37ff92728bfdc32116804a1338d93f7318dac0229d7a5f42
-EBUILD yarn-1.15.2.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.16.0.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.17.3.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.19.0.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.19.1.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
+DIST yarn-v1.21.1.tar.gz 1244168 BLAKE2B 351ee6421fd85563ceb5d1e49f600b4f315041d85b412cd36a0bcfe352cd974ddf6c53e03171bf173794400c31eabc4fca5f3ae2402770441a9d9942ec79cf82 SHA512 75082626febbe97fcd41cce96e20ed73686c13fa69a460c9033c25462003313bc5cd86ddc4f8f658ee0f70dcab892b767388ec08ca6df14151287528ceddb519
 EBUILD yarn-1.19.2.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.9.4.ebuild 985 BLAKE2B 7b005c3aa6d5ac229d56eb115952f9280523a29d4ad94c52fd2d66b699199296d3819ad3add9e124c8be69fba103407ea1ea8b5e388a2f651f9ca0d8f23cd9af SHA512 8e5fe167f9067c05a25a8da3eac42a229898fa1e5de02beade97b25c4e6814717bf498c581f1e5113409afc34eba0d0bf70bb303a2a1b49497093b95f4d6a038
+EBUILD yarn-1.21.1.ebuild 1058 BLAKE2B be9fcdd3e7c70238e3efd9431b333cd6252dfe09d5ee7e3cd05c6b448d7ff76b63aecf6047eee373e549b2d119897fb0f9362df5f10eadbc340b0b03017cc5bf SHA512 3ccce50a4f4aea6cb1c9a568943828f3a3ba1e9820e5ad8c3a00ba65494f71c2c4437f559ece09b7a1fbb8f772413eea6eb60cfb6d186d5c535654593d91f2fb
 MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a
diff --git a/sys-apps/yarn/yarn-1.10.1.ebuild b/sys-apps/yarn/yarn-1.10.1.ebuild
deleted file mode 100644
index d2f20fcebb47..000000000000
--- a/sys-apps/yarn/yarn-1.10.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}
diff --git a/sys-apps/yarn/yarn-1.12.3.ebuild b/sys-apps/yarn/yarn-1.12.3.ebuild
deleted file mode 100644
index d2f20fcebb47..000000000000
--- a/sys-apps/yarn/yarn-1.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}
diff --git a/sys-apps/yarn/yarn-1.13.0.ebuild b/sys-apps/yarn/yarn-1.13.0.ebuild
deleted file mode 100644
index 15ea8904d162..000000000000
--- a/sys-apps/yarn/yarn-1.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}
diff --git a/sys-apps/yarn/yarn-1.15.2.ebuild b/sys-apps/yarn/yarn-1.15.2.ebuild
deleted file mode 100644
index 6366d1485234..000000000000
--- a/sys-apps/yarn/yarn-1.15.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.16.0.ebuild b/sys-apps/yarn/yarn-1.16.0.ebuild
deleted file mode 100644
index 6366d1485234..000000000000
--- a/sys-apps/yarn/yarn-1.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.17.3.ebuild b/sys-apps/yarn/yarn-1.17.3.ebuild
deleted file mode 100644
index 6366d1485234..000000000000
--- a/sys-apps/yarn/yarn-1.17.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.19.1.ebuild b/sys-apps/yarn/yarn-1.19.1.ebuild
deleted file mode 100644
index 6366d1485234..000000000000
--- a/sys-apps/yarn/yarn-1.19.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.19.0.ebuild b/sys-apps/yarn/yarn-1.21.1.ebuild
index 6366d1485234..45da833461b0 100644
--- a/sys-apps/yarn/yarn-1.19.0.ebuild
+++ b/sys-apps/yarn/yarn-1.21.1.ebuild
@@ -30,6 +30,7 @@ src_install() {
 	insinto "${install_dir}"
 	doins -r .
 	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
 
 	while read -r -d '' path; do
 		read -r shebang < "${ED}${path}" || die
diff --git a/sys-apps/yarn/yarn-1.9.4.ebuild b/sys-apps/yarn/yarn-1.9.4.ebuild
deleted file mode 100644
index 40f106de033f..000000000000
--- a/sys-apps/yarn/yarn-1.9.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-apps
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)