gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /sys-apps
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
99 files changed, 2020 insertions, 470 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 44ad97755ef1..066ab295cc95 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index f07a994d3eb7..444731e5471c 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,6 +2,6 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 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.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.48-r3.ebuild 2346 BLAKE2B e3a8f643923c83411ec4b2cc420baff300a8a190af25770ca5e20e8e0520d53533b95ebfba06dcb9fdc369babedc4757e2090494244468e40c516f1b1af16ecf SHA512 122cff4cc15688a8650f5243007cad88393b884ec6c9c2cd763adf78075071d2c6a49ed575b05463425a60178b3383c089b306f053fdd4986b8cec0360201186
-EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
+EBUILD attr-2.4.48-r3.ebuild 2342 BLAKE2B fe3c6da2d4e6d44a9f48252def8b1f21ce11c6b1e8f565f91c08e8aa348a036b6692f27eb5f34b3ec4fcb7f7608b09c5ec11a0b58936c268a2c0ebfb9d6e05f9 SHA512 d71b34001abacc06cd05d43f85c3065b51d8a32e50b095ce7761b842eccab059fee3011c8c99aad93c9f9367cb0f3e70b57cb714c75b65614c9444115fd6c236
+EBUILD attr-9999.ebuild 2429 BLAKE2B 9845e90c65bd48ef71cd2c9f5e90cd59dd126035725ef676202408d3a8010f7bcc312be26c7e71bdf9c1f557d041ae6ecbfa74fd5a9484d446b1b923929aed1b SHA512 58db4a14882a02d67b36123b5a6e9978d621c42ca637de7dccbe733db0fc0aad4efe8546d828a80143fb7f72c1d2583b73c256d84327f3a50da2f8b8b4a596c7
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index a6f39968dfdb..53966a4fee89 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -40,11 +40,11 @@ multilib_src_configure() {
 	tc-ld-disable-gold #644048
 
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable nls)
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 1d01d82440c3..690027685314 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -48,11 +48,11 @@ multilib_src_configure() {
 	tc-ld-disable-gold #644048
 
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable nls)
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 9574a8b04858..88aa6cd77c5f 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -7,7 +7,7 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.2-r5.ebuild 2888 BLAKE2B f5ec243f42071caf10b9057967922052839a346bd7b01389fc7188f4a9cfae5a3fae3301de458e0784add09a34236561a60d31a847dd0ba207b8f616535bd5d1 SHA512 38cb894c196af88a88bc2e6ad95f4f4321267839484c3bd5dfaf122c0a8661ca98bcaea0ee0c230362a5aa977cd5c43198221a0d41cb2c864f03f0ce13ff0e5b
-EBUILD baselayout-prefix-2.6-r1.ebuild 11002 BLAKE2B 3a0a6d8ca22c1ca654e2c182a520e94c538129529ceed81915883702f80a71eb5bdc2c2b6dab67345d824f005c9a82719011b809feff0ec980acb30ae930a7e6 SHA512 5518b2ae1b3e3e058c6fb104524654a6aae133be1bbaae65e1357ecb9c1afaded0d444429be18b3a7737bb6a45da5b99651442748624936fc9ac4b6c9fb0f8e2
-EBUILD baselayout-prefix-2.6-r2.ebuild 11096 BLAKE2B cb767d72c0c30b6e6c4a3637472d482388aa82d85b3d02f9ee231967966bfec9c9f66dff5b9c2ef5a671f800dcfabf2a7e1827e3797de3726e20dc04e6003007 SHA512 3f479177e40de584dcce03d868bef20fae6e29f294cc355c2e462d956b44bd90dd4578100717ef352b5db636ad169f5acdb61b6d268d274a45954ad292e267df
+EBUILD baselayout-prefix-2.2-r5.ebuild 2905 BLAKE2B 882643b63254aed8d578bf591727744b529f9759affb39c3733535f565bb3a9cae0b7f3527ed1581590ef29098b74c5165d70b5bfb59aa14def3adb0e2dcade7 SHA512 6bf9c5da248f0d41108257ea9c122f18702532d62cf4e4058b4dad13a89041ed758e066ceccfbe9b6292852c5ab239792bd51735943c419d8cbc2c707b9d7517
+EBUILD baselayout-prefix-2.6-r1.ebuild 11019 BLAKE2B 90dc59e786944a546795a4b3ee51b1a848f20b480f994a0ef5c0de411f335802332ba46481f68df24a13fbe437034605961af4a8d97a3a0b2f4b421f001b62e1 SHA512 4cca7c13a675ec25ce26d263927ba638a85a462d89a096a8af19941a254ffdba6a196196767b82c1c0ed5089c286d4d4b64064774e053d17a3f5474de011e1a7
+EBUILD baselayout-prefix-2.6-r2.ebuild 11113 BLAKE2B a28a29a04ae4ddf0f19aea3a48c97bf0ee8c5de4ed46832cc5f774d0acae606217ecd8b2578d87be62e8e5d2fee7e874eabbfa7694be16181f2fd588ef31d87a SHA512 43ba8069b6463a156be1f29c455cd816da3588d9b45b3042e33d114852dfb7c76de72ea563feba61575b088752a7552df5e714fc208cca0a236b03fa5901035b
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 5eb365ee62ad..4edcdeb30b92 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib libtool
 
 MY_P=${P/-prefix/}  # just use "upstream" sources
 DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
 
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index b689642fcbbf..c4c13fe0e01d 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 5d827ac9ef85..1074a131a49e 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 4879d03c0ddc..f2b738672e20 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,8 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-EBUILD baselayout-2.4.1-r2.ebuild 8551 BLAKE2B 0672ef3559e8d401b6e62ccec3caa76f581fba0c9067244c93680ce2bcbae44b952c4fae0c053bbf633b522da84d24009411996d376829af256e7dc5189cc550 SHA512 7fde2a5bcb2940c09c1156d9070795534058c9225a9370999672cc7b30d202a626f3af74a0db897363f96227bc0cfab0ea89ebe3bfc38cdfed9dfe5eacb10d62
-EBUILD baselayout-2.6-r1.ebuild 9546 BLAKE2B fa62f6bb4ac1dda9b4eb2b321a84a146af5975dbf66012d204ee7609b6d68862177f2f1648016f2168b33ff788564c2a650f3dd93c73df8bf570c1aa8a08dd00 SHA512 d3085ff548184ecd8c5302252a8c002dda77a1e60e874ce0d518636dfed60fa57a79820d1fb2eab83bde5528f93696128d1f0769355b463ca137860eb8000245
-EBUILD baselayout-9999.ebuild 9554 BLAKE2B 7ecb4fd167c0633379b69480a33fe068ffbf096b860f65b15210c3d20a3ad642f7f99c4949c243c63c4a7b3e77fd764a61e8bb2cfe0e70e3388c0caeea30871b SHA512 68722948665e4eaf90f808c9a768611fddc8dd689d9e7e74fca587108b787f1e2ac0669cbf6b3b04fa8752ef28a151110dee0dc1ae88f627bc9bac64a6ad6309
+DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
+EBUILD baselayout-2.4.1-r2.ebuild 8568 BLAKE2B 57d41d33bd06d972845df561b03366ead110c9b98a8a20ae184a2aac10776f40ca586bb9b468d14d03b13eabbb159bacc672143ae4639914cdf7c2b5ba1a86eb SHA512 ee30bdf7a7db58f81278e1d9b2d6e9a6522f790ff3c87ec44f6035151981b2c490e3bd1eb49255fcc9abea1aada15d4de97b9f5730ff953168885c903cdf731e
+EBUILD baselayout-2.6-r1.ebuild 9563 BLAKE2B 566b25169d34e476bd8d853b7375ebbc16de0466f9b695170d79e215701b63219ff359ff1257643382ab149b5d7745a64b008459df062af5901f5e681815dd98 SHA512 b2c005ee885b16d36686d4f8ae44b3e47e62b74964d87195e26d19a6679beca72f7da8fe277105f78ecf319b88ef1e2d9adb0769dd58dab24ff77257f83fd6c2
+EBUILD baselayout-2.7.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
+EBUILD baselayout-9999.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index fc42f2d3ae7f..1b25f4786fe4 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 6398d236aca7..0e9f29a78742 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
new file mode 100644
index 000000000000..a4b8ca535ac9
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.4 ${x}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ! version_is_at_least 2.6 ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index dc992108fe8b..a4b8ca535ac9 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-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=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
@@ -188,6 +188,16 @@ src_prepare() {
 		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
 	fi
 
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
 	# handle multilib paths.  do it here because we want this behavior
 	# regardless of the C library that you're using.  we do explicitly
 	# list paths which the native ldconfig searches, but this isn't
@@ -196,7 +206,8 @@ src_prepare() {
 	# path and the symlinked path doesn't change the resulting cache.
 	local libdir ldpaths
 	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
 		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
 	done
 	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ed93ca1d04dd..677c0a79de79 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,4 +1,5 @@
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
+AUX busybox-1.31.1-glibc-2.31.patch 1883 BLAKE2B 127f3f8e90c97af175c28bc8033805083de0ec50281ad65a801fd2282913aa6b1ebe4735c124209df4ef8b4a76d3360a8ffd8fdc09d70a7b9c0fade29807f69d SHA512 9c593a67c4e635928d11f89b1ef75877ef0f5c5b25cf0dafd1fceb8dade57ec3590f16967e680422e66c00a2a70693e124c53ee5eec72d0697e33935b5280fd7
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
 AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
 AUX klogd.initd 245 BLAKE2B e8b8045cebfd39a8a088b70142e47442224ddf51d06b7ba7614721eb06bb8662184133d5464c79ece4826e5f338b54b6e2154b67f59c25dc9324fa526e82caf6 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835
@@ -16,6 +17,6 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 EBUILD busybox-1.30.1.ebuild 9430 BLAKE2B 9b0236c6078d0cb43f6e5e440c4f4a65fafaaeff777a638063cd854434a5586bd926eb7d70536dc6606f179caab9283acf5b5d590202d4c6c4dc30635fdd51a6 SHA512 91f9db9eb2ad6d12b10830928daa15334059fdbc8248dc360aaaccd419bee992e5a0b14a8c8b7cfe1ab60260a30d7e128b8b0ed89c8e863f7041dba499fd097d
-EBUILD busybox-1.31.1.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
+EBUILD busybox-1.31.1-r2.ebuild 9544 BLAKE2B 7f944890b532ab46bcab0c9e4e7078edfdf28609c65607372803118561b63359c37f5803e6f89649fe79f02d3bd88978e76ff3c2985bfc504e64204c27221065 SHA512 55487ac65ce9ad279d2a591768426ebaff7ab2c73095e6120bde729051f6bd886ebe4aa31fabb6c0d779d8243fdd9b410e7916f853e8839d7967272e344e0215
 EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.1.ebuild b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
index c15fa90610c7..658d7e2576e8 100644
--- a/sys-apps/busybox/busybox-1.31.1.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-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
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic savedconfig toolchain-funcs
 
@@ -26,14 +26,18 @@ REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
+	pam? ( sys-libs/pam )
+	virtual/libcrypt:="
 DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
 	>=sys-kernel/linux-headers-2.6.39"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 busybox_config_option() {
 	local flag=$1 ; shift
@@ -66,6 +70,7 @@ busybox_config_enabled() {
 # patches go here!
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.31.1-glibc-2.31.patch
 	# "${FILESDIR}"/${P}-*.patch
 )
 
diff --git a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
new file mode 100644
index 000000000000..1cef320b2842
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
@@ -0,0 +1,65 @@
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38ae..4ade6abb4 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		time(&ts.tv_sec);
+ #endif
+ 	}
++#if !ENABLE_FEATURE_DATE_NANO
++	ts.tv_nsec = 0;
++#endif
+ 	localtime_r(&ts.tv_sec, &tm_time);
+ 
+ 	/* If date string is given, update tm_time, and maybe set date */
+@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		if (date_str[0] != '@')
+ 			tm_time.tm_isdst = -1;
+ 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
++		ts.tv_nsec = 0;
+ 
+ 		/* if setting time, set it */
+-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ 			bb_perror_msg("can't set date");
+ 		}
+ 	}
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b3d..dc40d9155 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ 	return syscall(__NR_getsid, pid);
+ }
+ 
+-int stime(const time_t *t)
+-{
+-	struct timeval tv;
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-	return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e7f..878375d78 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!(flags & 2)) { /* no -p (-s may be present) */
+ 		if (time(NULL) == remote_time)
+ 			bb_error_msg("current time matches remote time");
+-		else
+-			if (stime(&remote_time) < 0)
++		else {
++			struct timespec ts;
++			ts.tv_sec = remote_time;
++			ts.tv_nsec = 0;
++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ 				bb_perror_msg_and_die("can't set time of day");
++		}
+ 	}
+ 
+ 	if (flags != 1) /* not lone -s */
diff --git a/sys-apps/cinit/Manifest b/sys-apps/cinit/Manifest
index f27c25f45028..ace8264c6ecf 100644
--- a/sys-apps/cinit/Manifest
+++ b/sys-apps/cinit/Manifest
@@ -1,3 +1,3 @@
 DIST cinit-0.2.1.tar.bz2 63545 BLAKE2B ef45cc1a2622d4dbf36e47fab2d09a576ea726e3aa2ac928827dae63fd976daf3dee3d91de21bc1f66200fcb90aecd267b0e9fef9575e525b8e75d00a0f818a5 SHA512 fce6a0c06b11a252023f7f0159fdfe4f9f4dc3c1545708997c148ed2f0a451bb68a5b98518fc48083e3518959d28b32b1719a9b89d00af7a997854230fca09d7
-EBUILD cinit-0.2.1.ebuild 840 BLAKE2B f2b86ba9b1384a945df7408a4c63ef27d4ffd21503e9f9d0279b8c10af372443dd67a941b26bb77a270d4d543df7f3e3606a49387c6eecd1bed0017882fc3413 SHA512 87796d60d8647d110bb91a404fe27e97c4ebbd8044e2ebe8dea968800c1d7d17d3f217cb5112d1bc0e135324965143e8806aa4a7e45c0d87833ed38f680185f2
+EBUILD cinit-0.2.1.ebuild 853 BLAKE2B 3b0eae06fb61d8537a9ad8561c867970d90c7ec7b80f5530a975edfa564a713c66ccb18fbdb5bd0b15ef4576b1b51a45d9ced7b067f8288bc9a513bfc6e8f838 SHA512 b9bb4f7366d746fab604428a4c8eeb4043a74857719e2f8b411e3386fb1c20135ce73287c2bae9e2a31591df28e6d95603a768faf53f0b9c4edf4496481cebd5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/cinit/cinit-0.2.1.ebuild b/sys-apps/cinit/cinit-0.2.1.ebuild
index c52fcc2f6738..252f62e217b9 100644
--- a/sys-apps/cinit/cinit-0.2.1.ebuild
+++ b/sys-apps/cinit/cinit-0.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,6 +17,7 @@ IUSE="doc"
 src_prepare() {
 	sed -i "/contrib+tools/d" Makefile || die
 	sed -i "/^STRIP/s/strip.*/true/" Makefile.include || die
+	default
 }
 
 src_compile() {
@@ -31,7 +32,7 @@ src_compile() {
 
 src_install() {
 	emake LD=$(tc-getCC) DESTDIR="${D}" install
-	rm -f "${D}"/sbin/{init,shutdown,reboot}
+	rm -f "${D}"/sbin/{init,shutdown,reboot} || die
 	dodoc Changelog CHANGES CREDITS README TODO
 	use doc && dodoc -r doc
 }
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 3b0d1383dc91..3e3b15bdd69e 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,16 +1,4 @@
 AUX collectl.initd-2 348 BLAKE2B df64bad334058680e3b78469120f44d99d38eda84ce5eacf3cb0650d64674b1c0fd0a92efd8974f73fdbb1a706ce48d61b37417b75c1a8d59ca13685af8b1b4c SHA512 441c5c90baa194dead6c764317ca4e10f864e82c1ee1f0c0d99f301ecf0baf197349df13fc155ac8e42366c56d13478d6004d6648e1131deea3a002c5e89ab66
-DIST collectl-3.7.4.src.tar.gz 462752 BLAKE2B 40d5e0e4f78951c6e28187e585c3079e5a25366e2569808f42a588ce2985277f42525d4876679a9398ed157e4b1d62861adec00f3171eee0b8547a93a54a71ff SHA512 f25686fe977e0a3ea45a1980eea87baaa92a2d81ec308838c137d181e2bf182df6cdf453c5c6e7f3f0b2ccd3066d17ab9c4137303b587f55303dd4afe7ae35da
-DIST collectl-4.0.5.src.tar.gz 624040 BLAKE2B 83e9c0eff03bc1560aa62e97fd788bb3e22b3484333afc72fea1e35e97b9db723f690ed6b06728f641b1f7ec3f939423eca198926cfa821fb8121973a39c2746 SHA512 a7bcc8c100f4aa1bc24b6f65bf1271ae3757dc37adba67982e85a7159faa9c1ea912553e5e918a79b95cf2ec1126094abad0a654e343a9be940ad11c4cdcc42c
-DIST collectl-4.1.0.src.tar.gz 625147 BLAKE2B 60361e16bdc1ac7619d3e36b12f17f02703266fe43f0c0ec59e89a1a0c8d2ffd5a0eb6bc693fab98fdd14d4d8416865f2520f55026105bfef6697e93627c0d4b SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5
-DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474a46593180ef18d1cf346a8d52e6b3f43bd6d0b410fc36dcfd694f2ebfd35b232e6939df319e086897a74679affe57c SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8
-DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855
-DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879
 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90
-EBUILD collectl-3.7.4.ebuild 883 BLAKE2B 70df5c4d318566d59deae0a5bb7ba2681a17c38f419ed9817777c31c722247ee8b2f5b4ac2a29a4f13cdf0ddb4efef92e40a106811a1f013f5059b52822b9991 SHA512 ccc74cd18cdd57a681414384005b2937b0d380f65656c4ce022b493e2f7d9ee26ad3b59aa5abff2e9b62fcb2a67bf532312d748a30cddd55ffa8fbcb3b7adee9
-EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
-EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
-EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
-EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.1.ebuild 837 BLAKE2B 4704911d0272ea031ceaa98f6df495f589c7855842ace07d41e83a26e36ae15e0210cddfae0ccd7147693689d40c0eae41deaff2318fe26aaeea03a65a9a1c99 SHA512 ebeba1e9e77431b0f20360876d185f68c98138c380ee8c8de3824628cf3a9a93f5ead204df1ab316a39b58fa56e663c6de0d2fffa1489fc1791a40af653f41a1
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-3.7.4.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild
deleted file mode 100644
index 11b4890af555..000000000000
--- a/sys-apps/collectl/collectl-3.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.0.5.ebuild b/sys-apps/collectl/collectl-4.0.5.ebuild
deleted file mode 100644
index c09f142f8823..000000000000
--- a/sys-apps/collectl/collectl-4.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.1.0.ebuild b/sys-apps/collectl/collectl-4.1.0.ebuild
deleted file mode 100644
index c09f142f8823..000000000000
--- a/sys-apps/collectl/collectl-4.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.1.3.ebuild b/sys-apps/collectl/collectl-4.1.3.ebuild
deleted file mode 100644
index c7ebec9b33fe..000000000000
--- a/sys-apps/collectl/collectl-4.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.2.0.ebuild b/sys-apps/collectl/collectl-4.2.0.ebuild
deleted file mode 100644
index c22ce227a617..000000000000
--- a/sys-apps/collectl/collectl-4.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-HTML_DOCS="docs/*"
-
-DOCS=(
-	README
-	RELEASE-collectl
-)
-
-src_install() {
-	dobin collectl colmux
-
-	insinto /etc
-	doins collectl.conf
-
-	insinto /usr/share/collectl
-	doins *.ph *.std
-
-	insinto /usr/share/collectl/util
-	insopts -m755
-	doins client.pl
-
-	doman man1/*
-	einstalldocs
-
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-}
diff --git a/sys-apps/collectl/collectl-4.3.0.ebuild b/sys-apps/collectl/collectl-4.3.0.ebuild
deleted file mode 100644
index c22ce227a617..000000000000
--- a/sys-apps/collectl/collectl-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-HTML_DOCS="docs/*"
-
-DOCS=(
-	README
-	RELEASE-collectl
-)
-
-src_install() {
-	dobin collectl colmux
-
-	insinto /etc
-	doins collectl.conf
-
-	insinto /usr/share/collectl
-	doins *.ph *.std
-
-	insinto /usr/share/collectl/util
-	insopts -m755
-	doins client.pl
-
-	doman man1/*
-	einstalldocs
-
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-}
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 0eeb8ad56585..325f6e62a82d 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 6164 BLAKE2B 2489d3826cbc9735633513a265120eea113e4f591a0aa428c8bdd84648f58a0b0de1a3281144eae7983bb82e90264edc7b7516656c239c0631e19c6c782d5b68 SHA512 be61a68021956b88bf103be7b396f979e28f40eab9516e704e42946dcc4b693f72d6fa6da3c8f6445c1868cfb5d0d670195e216f1cd97be5a0736d91d5b3f9d2
-EBUILD coreutils-8.31-r1.ebuild 5712 BLAKE2B 9fa751739c527648f58efbfda15a2af81c7308e73c09ef1683561c90c6504f0c624ead9b7119f4d5e1083f3eb44a86927c04f974a41ee90a8c6555f310bfa732 SHA512 9be4ba703aa70d0a6779ace0fdf55080c689dd54528974066a97e0edf7580a304927ac47b0bf938da3c876261b2691cc8dd4922027f95cf238e1165b45a14d09
-EBUILD coreutils-8.31.ebuild 6181 BLAKE2B ab3e5469399458f81d1176841358c8d0061abaf4c15faa8a912c43701aed540352b192986cffede61d2409c1bf934e1b7ee2c3f92d20cb1e9664fe73c7799250 SHA512 49304878ecd4b9402c5316c2da4eeac7847adbe06dfe052403bd3e17195032f71ee3c3571401e6a0f40ba8da636ce93ed90c1af834eab3ddcb29721f6bb81063
+EBUILD coreutils-8.30.ebuild 6249 BLAKE2B 3677e01cbf708355f2541ee61a996d7cfe40eda012b2dce2d2e11f6a5ad7d7ab3f51dad599a3a1a7c52c24908b7cbb3b9b7224f8b7666bb885f0b5aa89230941 SHA512 25bf004085f0e1fa64a5445fe4325bd95ecf5ed803e1b1a76a612c55aab332c056195b718256b567576552216f3228da86851efd4afb9ebdc9baeb5ce55c682c
+EBUILD coreutils-8.31-r1.ebuild 5797 BLAKE2B b6b9766aa8e3322d7cfda9735fbbf0ac721e14f05baabae8485c3eecdf4b91a83fe5da948e29bdffb95b074cca3280d94f521ec5af4a3cff4de51f157b425f1a SHA512 b2e92fc8e6f6584cddf66b87386ab659a5fd8c5f214eddfe4fef8b2151d120be9d5efefcd4f05b1322fafd89e7aee8b2447c8ff61f32f87a241839941fd0f591
+EBUILD coreutils-8.31.ebuild 6266 BLAKE2B 4120a189f397e054dd8903a5d4a8afe1631ad684ea1593ee59df956a1bb1145614ab98085a63b540ce81c89fda83769f4e9f3bc70160ad634f0e9000481f2be4 SHA512 df9e520ed5d78925b798886bd59a58f760bbfd5c34fe35acb7a330f888d4d4fdab261366db6885d0703777653646ab0f736951a13c6d67ddff4cd67c2a3ba2fb
 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 91ea2d3a06db..99156b6acf85 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -54,6 +54,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 643aa3aeeca6..60949e9d236e 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -52,6 +52,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 565e641c8b48..6cb35ca90f17 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -54,6 +54,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4844601aa2d3..698acb179553 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 7341 BLAKE2B 5ac2af986f670ac5cf346c5e68c3ed325a7f42445929f12f64ce3196690874bcae97ea2e9e43a8bad0440665d24d599a0bd4dd6eaacc3c37eeba0907096702ad SHA512 976de486813d080bb8a7af39347e426313f93498d1a759922ad33c6a6a9ded6f57d826c13541ed6b279d862ee272fc364e0e7fdaf6c51548f548d76246f2505d
+EBUILD dbus-1.12.16.ebuild 7335 BLAKE2B 2377700b5616ca3dba67866d6f483f18d22d404a67c995f298374593a4d5006125f8c4ffe5ac0f13453e902dcabd01c3249840e8cbf8f50503b1325158738c40 SHA512 a96bee928df5e4d157b1e2fe74913f6d32c457263a845320e35b5f949c8a1695c06566aff34527053ed976bc742b68f8176a7c88f09d51203f551a87affe6256
 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 4ae10f92cbd0..7a9f46fbf42a 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{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"
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index 88a994c742ec..644e4818bfd7 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-server-302.ebuild 776 BLAKE2B 13436e057e4de1a9cfe8bdff55574d831f8187da0530f53ad272cc733214bd477b431c22fb07af9c52b22a4017ee4417c462283b3c547bb74ac1cad69588373f SHA512 1c6d3d642b4b43389cab5b6ce62b3d52896dc4671d0eb45b0ae8906009514e9636cae9e1cd512a141b229519a0509ff4e649b422f48a16351583af7602f278af
+EBUILD entropy-server-302-r1.ebuild 780 BLAKE2B b8ea59ae9bae844dc5ad3c2c289cf14993483c5d9911b3794f64eac75f87971f9c4146a796274647b40eba1e32a8ba5e887959bd742a534b5654155e6f4ef72a SHA512 b5d8142aa59aa0baa33530b700760bdedbd98e60d5ecd911000ba101c73477e408de4848950c6360d6f215211458d54c2ae3680677f9a1d9a2fb130f6ffc0fc2
 MISC metadata.xml 320 BLAKE2B ca21ea36322c6397cc3a57f84d8392006a14261a39c4cfe15da3434916deb3f44c087514f1f2e6658979daf1fa5593f50b920fe3b433e18ed74564cc34df1819 SHA512 a04e6b7dd069d705503948c17b83da870d918959a1a82cb67efcdb21df45bf8b3e3e43213ae2dbd584cb99516b99585a792d6d022d8fa2577fdc0b2f82ca0fea
diff --git a/sys-apps/entropy-server/entropy-server-302.ebuild b/sys-apps/entropy-server/entropy-server-302-r1.ebuild
index cd447283274e..a3fb4d6d958a 100644
--- a/sys-apps/entropy-server/entropy-server-302.ebuild
+++ b/sys-apps/entropy-server/entropy-server-302-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
 
 S="${WORKDIR}/entropy-${PV}/server"
 
-RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
+RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]
 	matter? ( ~app-admin/matter-${PV}[entropy] )
 	${PYTHON_DEPS}
 	"
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index eed204e24d09..35cc083e7914 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-302-r1.ebuild 3136 BLAKE2B 183542696051e20d2ce6cf2020faa76a78a98fd3efc258b74423f2ecc8454927a204d2c18d4147f81307375700c287753076cc25ad3b069e5b68f0c2950be175 SHA512 9a2b1e6ed5b44912a108c33b8ccf717914a262084d802952afd12f7460ee7ce3b6c8580a4c26e5d0cb183dde997987f813ca7b5677bdc8d82f1e0c1bf7d3e89e
+EBUILD entropy-302-r2.ebuild 3169 BLAKE2B 9df21299499d377f283bb9f4d2ee371980a024fc8e616fabb7ba7522dfc28382878e420c044a2affb8c17c66b54b3f00883328205a308fd9bd5299258d4d76d9 SHA512 3570bb9b15653539e01792ca95626bb83fd3f86b03aa1088d0122bd50003ca66d2a3337a1b247893b454f7436558be1014425973b258755cb51ab466ece7fa36
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r2.ebuild
index a617ded3def4..60d514f0e66c 100644
--- a/sys-apps/entropy/entropy-302-r1.ebuild
+++ b/sys-apps/entropy/entropy-302-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,9 @@ RDEPEND=">=app-misc/pax-utils-0.7
 	net-misc/rsync
 	sys-apps/diffutils
 	sys-apps/sandbox
-	>=sys-apps/portage-2.1.9[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=sys-apps/portage-2.1.9[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-devel/gettext
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index a39e1652af9a..1d368bc4e90a 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 1963 BLAKE2B 348056361ad81207e9a7332c749a6b831e1c8f7b8c07c6a7a437d8f8bee0e1380f788c402fa11aed8d39a99c2980c4988d914812df159e1d36b02513f319522b SHA512 f55532b1d6314537a66f6bd8c8e72813ff69a0688b8bc796c2d7ed1daf2197369749c832103000c5136cb31ca4ca3e98db4998713c93aa028c6fb4b3d2a39f96
-EBUILD findutils-4.7.0.ebuild 1695 BLAKE2B 09cf65bd88bdfd092ef4c43569c875ab71493169127238b751e838ce9d3d6ab930b16819f575a99c18b44269ec549ad8d07585efe1ab691f59fda6e2a0d5524a SHA512 c4411d4c4280f1e4343acc0737a0a60c0cdb85cf0ce429e4c43e69b7cbaa7fbd5cc24d44bb3967bddfb135200e0ed47044336c8b548e51bce76755abea7af904
+EBUILD findutils-4.6.0-r1.ebuild 1959 BLAKE2B 4fb5c4d83a95cd5d06f228c1a678c92755a084a33c16caefacd2a134b53672d2a7c1a89104434b4634eb4a4a4f4473a77cf86f6c2234c1b57a2afa03165ab67f SHA512 1f0a54ddd86a8c6ea39e9515311beb3ddcdcd3b2d371bcfcfbf1a9cb45b4f86ffe9e8220df2d14593ac9f64d3d2333287eec9f9a4727271dcc53b4e0e3958d3e
+EBUILD findutils-4.7.0.ebuild 1689 BLAKE2B b185b21f4273c65e3ebf30dc216b79afde1b51493da909085a4ece0f79725e7c201b9fee4d6684081e2a454bc75506e3a7e718f2e90ead5d68af87aa9cde5733 SHA512 0f1a35f86716de18a620b57e2b0cd5c275078f79f5e4b6f6de4c283b08ec0b8ac6b4b86d41fa51f455c698e4a37bf16beb3316d25733398dc2de97bb370bb2e0
 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 f9cfaf8e2372..bec6913975ce 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{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 fca1640b4202..17f3de810dd5 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/fix-gnustack/Manifest b/sys-apps/fix-gnustack/Manifest
index 4f0fb576d253..3645b052e957 100644
--- a/sys-apps/fix-gnustack/Manifest
+++ b/sys-apps/fix-gnustack/Manifest
@@ -1,3 +1,3 @@
 DIST fix-gnustack-0.1.tar.bz2 105457 BLAKE2B 25825972d0a37335a6d6aec316e4dc972d6590da5d7d1145252b3fb4fbbf6276cc7818e47270065583558adf36522ea26652f8e7212a2046fc0d54c131ad5324 SHA512 df83beef5533003ceedda799bb27af15f877d2b3bc7c8213b2ac64a100270790655de3836eaa0ab8411d9eb91a6056e4902973b740b9b0791dcc5477226544a1
-EBUILD fix-gnustack-0.1.ebuild 440 BLAKE2B 555059c2a8bd48e854f8acc175e552004d47b577af102f17e34838135826825785d9f57ae824232293467f30b6379fa8458987ebc6961d6b592929894c7ad875 SHA512 5b132a4464561504187ced8adc27ab9d9afaba5002b03bd6ea7083c004ee3ec794904418150d2f9e033142d4317d59f87163c7ab1b40a9f154d0eb9056931544
+EBUILD fix-gnustack-0.1.ebuild 447 BLAKE2B 642e6d231e85dffc13c36eeed4266be352fb10e216116a95577bf1a16e30591acced107d605cd6ef8f7612787a400e4eb26222712c7d728971f49a78ef202b9c SHA512 d13ed53663c2f5512b44db3e86a62fa4d1e7fc9aadca25dcefcd4d69caf47ab113a06dc036fd669373dc8fc1e43f25dfe0bc2ac33aba167ba74adad3d9f22004
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
index ab3b556fe2a1..7c291908b48e 100644
--- a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
+++ b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Utility to report and remove the executable flag from an ELF object's GNU_STACK"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~blueness/fix-gnustack"
 SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 6b84b515cd53..952591d495a8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,7 +2,7 @@ AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409d
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
 DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
-EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36
-EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c
-EBUILD fwupd-1.3.7.ebuild 4046 BLAKE2B dbb75b4c53bf25c6717547e99b06e8954d35a96a11fbc0724791cce65f174183d4e6c3e2bc3a80d21443305d22a7c3fc41820fe9ba5988d2cd2b66b9acf71882 SHA512 191878ecd30802ac3b71f75575635f51a5d3ed03fe96452b8eeb8735e86121b98bd849e1102d392bd960e1c4f898f94323ccbedc6edcabfdf09f30e8eb905fe1
+EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5
+EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343
+EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f
 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 8bad64accc42..345dba19aaac 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -32,9 +32,11 @@ RDEPEND="${PYTHON_DEPS}
 	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}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
diff --git a/sys-apps/fwupd/fwupd-1.3.6.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild
index a0a687b89dc4..a9c5006ef34e 100644
--- a/sys-apps/fwupd/fwupd-1.3.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.6.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
diff --git a/sys-apps/fwupd/fwupd-1.3.7.ebuild b/sys-apps/fwupd/fwupd-1.3.7.ebuild
index 86067acbc0c6..becbfc3095f6 100644
--- a/sys-apps/fwupd/fwupd-1.3.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.7.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
@@ -84,7 +86,7 @@ DEPEND="${PYTHON_DEPS}
 "
 # Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
-	!sci-chemistry/chemical-mime-data
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
 	${DEPEND}
 	sys-apps/dbus
 "
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 51dcfee149c5..03667c40d6f1 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
-EBUILD gentoo-functions-0.12.ebuild 818 BLAKE2B 36314c207eb995b721240f68bb472810451d5d5337ff755151c314dc667f622ccd66977272a74f6c86731be91daf47b134bbca099b2ffb6786035017eef8b1a1 SHA512 4abfaf4a69424c69733a44dfd17cb33931b205ba5b305bbb5864ca9da78d2e6796f1b3807bb2618639600b52547cb7626006c7b81f1ecde6978dbfabb7f80d00
+EBUILD gentoo-functions-0.12.ebuild 836 BLAKE2B 79f8beb212fb25c19171848c76fc79e5c54bbe0c50ff8598c8457b19bbf6c6b0a6fd6bae9cfc236555f48d0626fe99f234817dbe8266546ae288be453ee4cb73 SHA512 035b7789e1c8fae7df019fe339ec601990f952484d44a87d1357923aa768f7ffa68c81077a249644422169d165bda1deea3360e480d1ba4b0b13c7e11cb6f196
 EBUILD gentoo-functions-0.13.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 EBUILD gentoo-functions-9999.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index 287a61aa175b..6d011618fc13 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -14,7 +14,7 @@ fi
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
index 2077a7e586e5..3d553e617d2e 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,3 +1,3 @@
 DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
-EBUILD gpet-0.4.ebuild 477 BLAKE2B 03818747d1aa423afe2511761db2936e78a189458949b9bb4c4c56ec7153df6fbc0bf0c84d23e764b6bff5c382f639b1d673d45c1ad137a99c46085fe6d59e58 SHA512 e5fb64396ded1401ffadce287274103b5a52d3d9300a5753a6922fb2502530c7bdbbe97d26f1c8c89ac3ef29b6e6b798e1611a117846736971e77ba481c5026b
+EBUILD gpet-0.4.ebuild 479 BLAKE2B 4cc59195abf756759b4b6e5ea9e42a6ca5a974339711d36b805918af75f9e5f3dae4d960f43840df2faf535935dfc9709f001dcd7ebba1462fdfa5d3834b468a SHA512 9df9ba5abdae33247c01fbcd6875340cefa001a4a38d8bea577cf8174e742ea5b9b92ad082015803ab8dd3b2d87801fdcb71ca1693394e5c6ec898a77f6e51b3
 MISC metadata.xml 301 BLAKE2B 352604d9a85c67dfaeedfaf59ba0a306a5e28638b13d0e04aebbbb410501a42393d8ad0be7efe19cbd47259323806eedfcbcedbd31b523a67bc4158eef46aaaf SHA512 fc0ba10b181262a33c2acd9a694585af1d05f1a09398a4f42e7693bd92990654d3812c0eb0ee254425662a63815e0211ea34f20ef2cb7c8fefcc0b6e37ec5b74
diff --git a/sys-apps/gpet/gpet-0.4.ebuild b/sys-apps/gpet/gpet-0.4.ebuild
index 116891f39944..70a0b701a922 100644
--- a/sys-apps/gpet/gpet-0.4.ebuild
+++ b/sys-apps/gpet/gpet-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="GTK+ based TOMOYO policy editor"
 HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"
@@ -10,13 +10,14 @@ SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-RDEPEND="gnome-base/gconf
+RDEPEND="
+	gnome-base/gconf
 	sys-devel/gettext
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/pango"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 7a88f286b48a..18c7ee34d4c8 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2796 BLAKE2B 3f4fd1a8ebb16b1fc8fa928dbe43019b6e327f074f43de5927d1a342b0fbb26e375728cca06edb5718227c53e9563a11e38ccc7fe5b6efb1ec0eca099076b28d SHA512 123c5025e9c19d0d4667bbad1174e01824b8d1b4eb81135bc93b3e5709f76b3f7c64890fd0ab6228f2f45c0eddbdf64eea79fa812779a83b185ad975ab9705f4
 EBUILD groff-1.22.3.ebuild 2507 BLAKE2B 23f2c59923f0421245f635314a1183077a94725e76d42bfcea9bfcc64e8167996932e9ccd77d674742d1b132a5ade620908e42adfb3022a6e2f04e830c01e83c SHA512 1f03843cc9e0c12935dde8173046b7010bf47e59c650d562d78bd7bd855435fc54a9878443a36d025e2e1c8a6d1c469721213731e7c19ef2664f569988bf1ff9
-EBUILD groff-1.22.4.ebuild 2571 BLAKE2B 3bdab91c27a8cd1d46bd769f31e95f2acfc798b2c2e953b1aeec165d435fb7903ccc76a5f073f6714b4c3c0fcff2a96ba9120578bf45db203906ebeb345cb08f SHA512 475e28be3a0294083cbc65fdf77dadc073ddd2f77866f5f27ccd806788a3d2c4c6bd723ca8e38c94794ed5138611d96e970e6b31ad53905aa2aec0e021f7e0e3
+EBUILD groff-1.22.4.ebuild 2567 BLAKE2B 9b83933b71a0f6c2bfa8d2b322f0064409bb0c0d781dec890252bab4669d3670d17e83322230c0127a1d880fc839b8d8d8658bd871a06ca1ba57c0cd0c429984 SHA512 8975a6d2cbe875b6fd6c6976da9f779a28ec6c7ad26782190fb61594654ab4eeb2bc6b0a6bf47a757839e93a59f2d415950c21fe403e27ab6936b5702c47fc2a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 5cc2095734ed..f24193f78f45 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	default
 
 	# honor Gentoo's docdir
-	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \
+	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
 		Makefile.in \
 		|| die "failed to modify Makefile.in"
 
@@ -61,7 +61,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults
+		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-apps/gscanbus/Manifest b/sys-apps/gscanbus/Manifest
index 3688de955a05..5058e3db01b1 100644
--- a/sys-apps/gscanbus/Manifest
+++ b/sys-apps/gscanbus/Manifest
@@ -1,3 +1,4 @@
+AUX gscanbus-0.8-Wimplicit-function-declaration.patch 386 BLAKE2B 0408be6cfaad0a1b90b7d48b2b131fd8d66823ac3ed159b6005257d61f29d3dc871bef1e403c5fb0454444def5d158fe85cff035bf9c8687f8984bd5cc83240d SHA512 ecc49af667ad35c56c12e83e23ecbcb771bb14fa750bd2ebe3b334e6fb666d113fb45a1f77a575459b8bf51888057a7e17ed3cb5998cf0a3845978234d0afd57
 DIST gscanbus-0.8.tar.gz 215739 BLAKE2B a07b5f067a064715522ecf3665c84390cf720c4ebd3ea276259107b1a17c0c26e6a439b6c3e6e1a76644572967d8aa38f18f7bf96ba3a77ba0f70937f6e7f903 SHA512 a5f97acb57869b151fbdee5747510f554b8d67b1889ce199ba803bc75a91d1a8b98239799ce61d775923dfff0767db518a46cf9222eb370150ea158eecde95be
-EBUILD gscanbus-0.8.ebuild 506 BLAKE2B 15123b3ace3451be088308a68ca132324509329e45e8f14665fb63c43475577eceda5f317c621266db97ba7d0aa9bd19d4704877cd312c643c780cfcb1c47a14 SHA512 7c42011df8d0d66d59a94509143612c120067dce24b53b0e7eeeeed17a8bf1ad0aa8dcb69bf7dced17a7d6f3b7bd0e0e25d3350a916e30352dd0f9151ac2aa29
+EBUILD gscanbus-0.8.ebuild 545 BLAKE2B 2f50ac890b5e6b28cdcec82d8accb6bb9b626d679bca23cf204ac49825a9afc69e0a17343f8ea20259ba7af458f2cce4430e8d186b557b78b18b945679c72e29 SHA512 361de4996ef51837ebb20b29bced179899cae71ffcb97fddb7745392cc58bcf5b8037db26f863e17befcc98e086923d48bfb7296e4774f3663fbd17b33286d8c
 MISC metadata.xml 336 BLAKE2B 0b5dfa774dbf36c91ac6b37b851a7c673057044a4831472082a583cda88d20c75da5a6903d26d58876c9d7a352f4d95117f66e2de11bfe33b0ee33e3db6b21a8 SHA512 f40619fce237b7474a6d8e8dd9e6f2a145b035f0f83534e298485f92f15a9ef4ef343db5a552d412dca548261a4ae0dba4efe280a988e2b95c08f3179b644f43
diff --git a/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..79a585694ab0
--- /dev/null
+++ b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch
@@ -0,0 +1,22 @@
+--- a/decodeselfid.c
++++ b/decodeselfid.c
+@@ -25,6 +25,8 @@
+ 
+ #include "decodeselfid.h"
+ 
++#include <string.h>
++
+ void printbin(FILE *stream, unsigned int i, unsigned char width) {
+ 	int j;
+ 	for (j=0; j<width; j++) {
+--- a/fatal.c
++++ b/fatal.c
+@@ -18,6 +18,8 @@
+  */
+ #include "fatal.h"
+ 
++#include <stdlib.h>
++
+ void fatal(char *s) {
+ 	fprintf(stderr, "Error: %s\n", s);
+ 	exit(1);
diff --git a/sys-apps/gscanbus/gscanbus-0.8.ebuild b/sys-apps/gscanbus/gscanbus-0.8.ebuild
index 693ade0c091f..98a308f1c30c 100644
--- a/sys-apps/gscanbus/gscanbus-0.8.ebuild
+++ b/sys-apps/gscanbus/gscanbus-0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem"
 HOMEPAGE="https://sourceforge.net/projects/gscanbus.berlios/"
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="sys-libs/libraw1394
+RDEPEND="
+	sys-libs/libraw1394
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS README TODO )
+PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0f200baa211f..2eb2cb416497 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,7 +9,7 @@ DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
 DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
-EBUILD iproute2-4.19.0-r1.ebuild 4387 BLAKE2B c286879bdc8e4910af49170daab9a6a06d9fee11324b30c8a2bf2c7a902412623554e84ac75ab0bfbadae9a99f79903bb37a594ad50f32db63ded4c491ce7de5 SHA512 1c378aab94a08065c9fff812b0745279206c25599343485185a17e70c44a96555a3877d6c0d5ce6501c7c30ee7fe0037de3abba81a2b4b0f001d9131f5014339
+EBUILD iproute2-4.19.0-r1.ebuild 4373 BLAKE2B bc56146a05a953090a1ccc239c45768201f4c80c10f91555881bdc0a5d3ccf355e3336236ec2dfbb9c6a6152fe31c357ee35fb7f369b1c15d117169a4093451e SHA512 a4eb2a2a860167ee6c4bddd45673b0e3cba41a1e04c46711836c2ed23a0e947d5e4ae4210eb2427f9f6241479e675d84b5c6ed0fd68353621070b28dd0a6fe9e
 EBUILD iproute2-5.2.0-r1.ebuild 4481 BLAKE2B a20b17c75ab3b6c6d2178a5f91672d34c513e5099346257769ab27726491073e6b6b13e860257f5f3b8553796ab159bdc507a42d2e4b99206f1ff31caa99d55e SHA512 2396905be8efcc6fd080d45a6ebc754acdce08e39d8dd76b4c59639bdba12f4cf21b3e450ea18ee4f714b08a52617637176a801ec0264019703967f7051df07e
 EBUILD iproute2-5.4.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
 EBUILD iproute2-5.5.0.ebuild 4436 BLAKE2B 94c362ae57a596e69c689332a249ea4afea060cbed87ce8a55cccbee21486112b150716762c462f65a025c41607c151d9123176c631dd402efdd528ed3023865 SHA512 bcf437aca85d661ad08061d533dc934e14c802bb8c498ba88700e016935c1221f379bd055c954cc2dbe1427ae86a3d638ca43fc8d8731ae0df5426689cd06e0e
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index e0e3327e66ce..7c6651c21260 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -128,13 +128,13 @@ src_install() {
 
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="${EPREFIX%/}/usr" \
-		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
-		SBINDIR="${EPREFIX%/}"/sbin \
-		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
-		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX%/}"/usr/share/man \
-		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
 		install
 
 	dodir /bin
diff --git a/sys-apps/lcdsplash/Manifest b/sys-apps/lcdsplash/Manifest
index c1322e49eacc..27d1d574bd83 100644
--- a/sys-apps/lcdsplash/Manifest
+++ b/sys-apps/lcdsplash/Manifest
@@ -1,3 +1,3 @@
 DIST lcdsplash-0.3.tar.bz2 8121 BLAKE2B 52baebd47f6b72fd55c3afaa4a44803fd71b3674419a6fe43b8a642cdfbd14fd964e82db995707e48b23ccf0d323f9f6853f1a5558ae3ff64b6332cc9880ecf1 SHA512 4d40200882260c31cfe20988cf64d27be0af7f1ab983e5a998dcaeafede074e882379508a775f54690105591e0802eb897559eb7437d81f0b24096dd8c363243
-EBUILD lcdsplash-0.3.ebuild 591 BLAKE2B 710b35f5b9477749d8e8bb7ea6cc841ad1fbe6fb641808490ce44cb6ac14ca8120469b240ca28fc7c8f67c7d6c910053aa49d70e6b2c55f529197fcd0912712b SHA512 d47fe1dd7d4f1563b4367b5547801dfd87063dc6cf904f992ace4e53d7cf72d3367d90c3a8eec250e71ffab0ceed6e19795f8a5cad595752d634f353f86c9d97
+EBUILD lcdsplash-0.3.ebuild 608 BLAKE2B e5715921e5be470607eac65d261c82598a9648908b5045fe380257a0f6db75ba098d1990a11caa9166b05cbe785844284f15ee0e360f1abb274ad248c1f252ec SHA512 3a8b4eae5214f42de234977de8dd4264caf019f070931941d5a8eb3d27cda8e49f628826c37112e5c164bce9df170bda90ee94067d4e4751479c37a847aeeebb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
index 21435a81ead6..a0bc9b81e6fc 100644
--- a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
+++ b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="splash Gentoo boot information on LCD's"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index de4e4e32cbb1..2737547d61b8 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -12,6 +12,6 @@ DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118
 DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
 EBUILD lm-sensors-3.5.0.ebuild 6479 BLAKE2B fff78d53b823063e4324941a71b4f0027db1b7ce7a4fe96a1a8eb4987074f75de331c9cf063585d22659fcb4e03805a0310f1864317ccf52026b2457f8a56699 SHA512 ae7008b8dd9a0aeb20d96e160441d3f5c112ff40e4d80dee8d1501477211afd1c7aab70701a06e69a974dd2d7d1b10e8a3fdfede48674f17726e32c0d625c411
-EBUILD lm-sensors-3.5.0_p20190505.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
-EBUILD lm-sensors-3.6.0.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
+EBUILD lm-sensors-3.5.0_p20190505.ebuild 6443 BLAKE2B 4e5257f7b17cb449c94c6e2f306bcc38a85e68452b9cfa2b59e2285ac7807666b1f1b961ce0e5e37d6c376be6700b3c54b9d2557234d1ed506e9330997f7d3e8 SHA512 cf25c73989ac5af1a1c9e85ef5476a545aa5c33045049ee5aeaf8c5492db60518215fbb67b390f29ebac9f1cd24c189db4b8508ae9cef7be529d164bf63b2ecb
+EBUILD lm-sensors-3.6.0.ebuild 6443 BLAKE2B 4e5257f7b17cb449c94c6e2f306bcc38a85e68452b9cfa2b59e2285ac7807666b1f1b961ce0e5e37d6c376be6700b3c54b9d2557234d1ed506e9330997f7d3e8 SHA512 cf25c73989ac5af1a1c9e85ef5476a545aa5c33045049ee5aeaf8c5492db60518215fbb67b390f29ebac9f1cd24c189db4b8508ae9cef7be529d164bf63b2ecb
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
index e2d8209c6ad9..34df54fc1062 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D%/}" \
+		DESTDIR="${D}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index e2d8209c6ad9..34df54fc1062 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D%/}" \
+		DESTDIR="${D}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 19096364e6ae..2ed8ae9c92c7 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-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.03.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
-EBUILD man-pages-5.04.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
+EBUILD man-pages-5.04.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
+EBUILD man-pages-5.05.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index 63013ab5b776..6450c0bbb0a5 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -14,7 +14,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.05.ebuild
index 6450c0bbb0a5..63013ab5b776 100644
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05.ebuild
@@ -14,7 +14,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 0801cf31e9ad..86388c8fa515 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,3 +1,4 @@
+AUX memtester-4.3.0-fix-gcc10-fno-common.patch 514 BLAKE2B 5b911fcd0ca63030e471f8e0e721f808ff8161d5cb14e51bec33bb61313154cab746880d162371a0a05b0c7fd4d165a90d5ad850f7d03139bdcdd7d5a24a5430 SHA512 ee0c21c40185fefe32d55c9f2b704db2b769189d6902369dc77078417fd7babdf6d2a6ba34dc4db2a8203bbe72148476d167550e8488477c4cd4a7bc221951f8
 DIST memtester-4.3.0.tar.gz 22113 BLAKE2B 564cb874ea8263e23049d99417bb75f4d9f6fe1bbc022b2f2043735548c97f0060e877079087e524738bda3f9669d0ec171fb3aa9958a2904d848ace87d1cd91 SHA512 045bcc73855706ff03e8ca65297a0d6e5b5ac02f99dae0f17cef1310b403efcb78d9a7295eca6d2de703b0a7b2f71b58a37f5a42040f01fc77a321a8d2205888
-EBUILD memtester-4.3.0.ebuild 716 BLAKE2B 33911a95eefdf9b76df8bf3828528ff37836cbfdbd6b5a22c4ee2795110b6f33fc3f1365d3d5ef948e7148d01c5779831c4271adea9659c7ca0909d366733112 SHA512 976bc16d7b2acb0ad6c31d67c979be77e3ef351a2b8f949b235a3cd916d4047af71a0fda3fffec6cc2573fe4a27385baf5bc3421864d7c71f661a9d60ba9a233
+EBUILD memtester-4.3.0.ebuild 787 BLAKE2B 732b507aea997202701c14d12521511ad0365835ac3925b5aa9e207f25fd7b50ebb93281e1deaf64ee9fd7c2ebf62a6d2a14501ba1a83ca13017cd2929833d70 SHA512 227695b1358e01bd9c3162673f8ad017481b8271f62e231a638e33f34806cb366f3369ce5a1e66c9befd5789e7c40cc231b585a30f348633502106b8220517ec
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..8bb58e5771c0
--- /dev/null
+++ b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/tests.c
++++ b/tests.c
+@@ -27,6 +27,9 @@
+ #define PROGRESSOFTEN 2500
+ #define ONE 0x00000001L
+ 
++union mword8_type mword8;
++union mword16_type mword16;
++
+ /* Function definitions. */
+ 
+ int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
+--- a/types.h
++++ b/types.h
+@@ -25,12 +25,12 @@
+     int (*fp)();
+ };
+ 
+-union {
++union mword8_type {
+     unsigned char bytes[UL_LEN/8];
+     ul val;
+-} mword8;
++};
+ 
+-union {
++union mword16_type {
+     unsigned short u16s[UL_LEN/16];
+     ul val;
+-} mword16;
++};
diff --git a/sys-apps/memtester/memtester-4.3.0.ebuild b/sys-apps/memtester/memtester-4.3.0.ebuild
index 56a07613ef14..cccff64b5d43 100644
--- a/sys-apps/memtester/memtester-4.3.0.ebuild
+++ b/sys-apps/memtester/memtester-4.3.0.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="userspace utility for testing the memory subsystem for faults"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz
+SRC_URI="
+	http://pyropus.ca/software/memtester/${P}.tar.gz
 	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-fix-gcc10-fno-common.patch )
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 7bd304aa4cad..4af851977c6e 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1822 BLAKE2B 9bde532e7957fd3110578b3d2997526b1a93166ec0bcbc03a531e0f11cd7177cceaac1201af5653c4a7e086bc8e4f00433802387cfb8c4c43c8c7157c69bb29c SHA512 281ab0bb5ea6ec6e973ecf10d50a2d29dfd0673f2a91efe13f08707be683a2fb46a3098c1798e3c7c5281575ae54c8e02c48921144a0a35f494bbcab98fed411
+EBUILD miscfiles-1.5-r3.ebuild 1818 BLAKE2B 185700d526f100ee2469c3c15e288c8959f22820f4799d2ee784d6eb3425cf642f5d106e145f57ae168c9f950db20ea504dbf3be84777e264b4dddbf86cbfae8 SHA512 f2a7fa67a48c8442c6dbc21af1920f07fa9b33bc0833739896e51792265c171a61d25859966f6aac7ccc43cde8bd316e843f9a744f4b6cb942b73cee2b39b202
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 8a94a6506a5c..4a787aecfb0d 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --datadir="${EPREFIX%/}"/usr/share/misc
+	econf --datadir="${EPREFIX}"/usr/share/misc
 }
 
 src_install() {
@@ -57,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then
 		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict "${EPREFIX%/}"/usr/share/dict/* > /dev/null
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
 		eend $?
 	fi
 
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index cfe9af0dc50e..bfd85748d1e2 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -2,6 +2,6 @@ AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f8246
 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.2.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
-EBUILD opal-utils-6.5.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
+EBUILD opal-utils-6.5.2.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
+EBUILD opal-utils-6.5.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
 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
index a5c514c95a77..12cc0995a254 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.5.ebuild
index a5c514c95a77..12cc0995a254 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 9b01d839d07c..6970e0358d49 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,10 +3,10 @@ AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-DIST pciutils-3.6.3.tar.gz 488501 BLAKE2B 77a1ad1e034dac0bfa67ae3a40c34fc394510bb61af1f929e8feb3eb12e9d44b48cfeee0ba786580531222c75c33613b423aa79e535316d2543ac1ba4224312c SHA512 0f6b272cf83e0ff857e4d38c72935709826af054620cd8d70cf8765d5f547f32bdccf5c76a47c8b24d8081b48c16882132a3b503f6a329e73a66089877d5e47b
-DIST pciutils-3.6.4.tar.gz 491066 BLAKE2B bb63ac307f5a66ffb6505bbd7d030fdafcfea13e0b8f3b718c98ce693febbcb90ac7c511bf27d20688f83fd56994b2b246f94323386fd1cc16c79b1b8cab9ca3 SHA512 de36aef89a5269888b065df926fc91f24641e488492ad713f886efa4fb544a4e7f7609028d233fecf1755e15e08d4a41f2837f356f26c73d297a67b0b026e29f
-EBUILD pciutils-3.5.6-r1.ebuild 2871 BLAKE2B 70e11faf9e5ef8777b6771aa0381282ddeff30cdf447d5071747065af265b5a72894b6eabe23a1eb2d5a93085b4fb463502ea28b53c5c5daba9fab35123d8b63 SHA512 0a25dd1d3e84f0fe8a63231192017fbc454bb6a42fd5501635d5819397e1dbcb2294aac4297162c8ae77546022a1af0388e043a1a44c68661fa3943d96bf76b6
-EBUILD pciutils-3.6.2-r1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
-EBUILD pciutils-3.6.3.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
-EBUILD pciutils-3.6.4.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
+DIST pciutils-3.6.3.tar.gz 495316 BLAKE2B 01dab2337dcde5dc436df6892ce7c54c9c875b7c619c8f8675027e82e1073ab9b4c603f61f9b03c27af90fecb60fd35199fdf0b62dc90b5d2d387bfde00408b3 SHA512 deaf265bae9149289c860eb47cf6b85ff300744a1e79bcd232819f56e6dcdddcda4e7d3639869c228a492237985298866eb2633938b00d880545594e3c02df05
+DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
+EBUILD pciutils-3.5.6-r1.ebuild 2864 BLAKE2B 494993bc4f075947e7e14debe4976e4314d0110132a20435d699ae3ec762f0c026ec57a299ff11ad596457168d8addc770f6d1da73ef924da7bef71f66129b05 SHA512 d37cfd99e4eca9aa76197ab99a99d53f14ba31d771e928984ce34d6a84cc006bc3625359f40a2734e39358e09ed526258e6913aa7d656ea052a19111fa8c7a9f
+EBUILD pciutils-3.6.2-r1.ebuild 2876 BLAKE2B e7852e9b01891c796595b6c281d1d54fed85c43f6fee281aa02a8cd6cc1ac9e1dfd86679a19ae4c749802b7813a0e6cadb9e8f411d9c1f00b3f3f661fd5b2944 SHA512 98256f4499e6a4fda867a0836b14b1ae5cbe1e0dfb9cafb712b86c7551156c8739c8e839055abf54a36460579927fa21d83be7f71c2c74270d246486971f30f3
+EBUILD pciutils-3.6.3.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
+EBUILD pciutils-3.6.4.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
 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 419256b04b84..010634ababab 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 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"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 587b417565ab..6b4cfffa226d 100644
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 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"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.3.ebuild b/sys-apps/pciutils/pciutils-3.6.3.ebuild
index f3a83e518b7e..d7349d7b8671 100644
--- a/sys-apps/pciutils/pciutils-3.6.3.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit 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"
-SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index f3a83e518b7e..d7349d7b8671 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit 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"
-SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3ecbc80abe18..02a004c91ea1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,11 +7,13 @@ DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec165
 DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304
 DIST portage-2.3.86.tar.bz2 1046806 BLAKE2B 6aadfcf17eacc8f7b82645a82fce96b7d90e93d797704c5b04fe437cbe587440dea8f8e39847c2c95eacf383e4525d4f015ee26b41694c156f907bd22d6663fb SHA512 fad0e89fd2c831ebd8cfd1fe080433c4696f408008f463a151e6fd4f3a2ab2a81249dd0db76f28c7d2cdf0e14e5163c3898c7ca22e7f0edb2e882e1ab7bda95e
 DIST portage-2.3.87.tar.bz2 1046448 BLAKE2B bbcb31a362d89bc81cdedb03be431792dab53d983d35f10853e6a68c2e2fb3da8ddd237305e78ab5946c8199f4dd7a3a41f023912a50abe9fa96bcf7ac35af75 SHA512 47a4d4901c2ecc9df8e38fa804efeb8583928a77e45a9b19dd8edd7e1323911762c357ad0bc1a182d8389225282660f4ef6e442e8addc087e404d561466c3b86
+DIST portage-2.3.88.tar.bz2 1048081 BLAKE2B d84b13686d09d125863835467989a11787333dea18a7eabb48560e6847c54643155a98c74d061e08b991064bfa9236e0a617a06beabb575162c4968e4cc13fe8 SHA512 ec043bbd7667f810e1a7c7fd3cae19b81adac1c323d7c488d1e4e809d9cec7c7f13bc2e5b8769a03b9f8aa78e389f5680e15b6a8f0f3543cf43d0f43fb7ee5f7
 EBUILD portage-2.3.69.ebuild 8117 BLAKE2B e0fdf8ebaa0fc3212c22727d000183d19c9ebca6c6e00d90a1100b0995f3728d5c4ca44287265109e579671acb27a787cae93f688c70849c4e4cb0b51d55edc7 SHA512 ba7b31dc7e39c0c250dcf259988af8c6b5f175fcfdc975a88bd6263863123900e83aa5363e447fddfa3973d8ebeaf7f5e256cff265b5690d6d4f7ce5f8dffa33
 EBUILD portage-2.3.79.ebuild 8706 BLAKE2B 162fc0fc36eb2f1d47208ff7a151e546f685edc674bb9292c83682e425da2fc30ff9cd1f7ff0acacb8487cfbcec69da6d91099224786f253407086d7e2e4339a SHA512 c24857fafe48639ecfcaff5fff978cfd3cf098add398fe32a74f3bf5cfad9e3f73fa6c86a1e819c8191c89761a7adf257746ce14a1216af5a704cc35ed955613
 EBUILD portage-2.3.84-r1.ebuild 8908 BLAKE2B d835618f242d762c5dc7bf620c29c7160e0b73158f78cbb3c01e8a2cfad67500696ef7743c096956e17317d295df46ce2fe2a445d95bcbb90687bb57b6b49fe7 SHA512 0b2b17622f362afea4db847122c25321ab49fd6ffdc367f1a25d63566866981fbe2eb196f4463166ef31cdcae2675db8a50ac6347e40924d5eb8ab1c2d452486
 EBUILD portage-2.3.85-r1.ebuild 9068 BLAKE2B 2bc3f22e598af5876d491d8dfe6d5c09e0b23799cc8d48a314687ee7348dca30f9a2b108e6a7c8bc0e989ba59fd96693d577625cf7b9accfb2e5efbcc45e2924 SHA512 09a1176c275a83a25677e18150142b9df46ca83d8b99f7755181f36980f259f3504dcf45833386e989835d763362b5dd027dff84b85ae897905ef8c6783df72e
 EBUILD portage-2.3.86.ebuild 8738 BLAKE2B 661f810944f512016d98a7b7ce9005f6bdab444fc2fc10e3fd3f0d958372d38e2c5cb5cbe744674f25e6eaabd7657956e00dbf8bd1316d8b72d24cf60f7ca0f3 SHA512 eb581642860da1e01cd4e607bf24383b4d14a3a1d42ead6ced5d983c466a98b1742a777e763772849120d30227de550001104d97d65c905502883bde1c4ab137
 EBUILD portage-2.3.87.ebuild 8362 BLAKE2B bdc941b86140e015725fe23435ab438507cf464f495e867b605c9bd8fae2588c673f533803937ac73d5c148aec89361743a83e9576c3b7bff1efe40161fb439d SHA512 963d81d6c24c36b76fc2bcffaac51d4c6f714c8475d70d7ca974da9a6f1e454d28ae214518607bc52a63bda0d2dc795006e63e21fe44822b992b76b31bbafe6f
+EBUILD portage-2.3.88.ebuild 8651 BLAKE2B 40d49821e5d53d7bb797f9f53d6fabbe6e38e9fc3f72a282f0e66e78baa58ab8dcb48862f9d5f8cfde6ba3a520f6a2bad7814cdcc16e8d15712879653225acf7 SHA512 3b099cf3790b90b15a855bd17435109d6310cc0edac116c9531088178c172f128cbf0f28648bd134057ced367f91e3c5c4be701b64839565912a27605b464c00
 EBUILD portage-9999.ebuild 7794 BLAKE2B 3b6487927a5a689ec37052d38fd2940d099d81b64bcffd48ac3083adfd282504d5399cc12ae8b266d49147f793c411eddc99a9d081522dde054fb6e31b3a9a0f SHA512 b5b9ce2235d2145cbe467167ca2391b996327ed52a84d139da292518ce76ecbda2df0eaa88eddd7197dece2520a49ec369a5ec123bcade99d562b6196b6cbff0
 MISC metadata.xml 1508 BLAKE2B 23da1db6792f98d7c5c6ff0f260c69f76110438c6fd97ffb24552100f6a2e5c8264d0bd787f45367900b9ffa5ce5346badbf53a9f6be7867e725451c33b4f41a SHA512 f6712987c3062b960f76b6752c80ffa6069cec2d8ff743641164e275677ac8126fe2af6ab1588e91712ba6bbb11f73c6de42d6296d67af55ccac3ca48554162c
diff --git a/sys-apps/portage/portage-2.3.88.ebuild b/sys-apps/portage/portage-2.3.88.ebuild
new file mode 100644
index 000000000000..0188237e0e12
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.88.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=(
+	pypy3
+	python3_6 python3_7 python3_8
+	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="apidoc build doc 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 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/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
+
+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
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.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 apidoc && targets+=( apidoc )
+
+	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 apidoc && targets+=(
+		install_apidoc
+		--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
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index b75a0a2276b4..eb3f2ade643d 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 2101 BLAKE2B b6eed30f4fe1c2d5755b56c5a40159d1c24b50a3d900e26ada7b4d5e5043f1cf127bb5fac7cdbf63dcbf6d1548957038db0285588df5a8b7aba2b7225a3e7a84 SHA512 20751b506d74ebeeff6254c22a7855c3ed6eae40c6a0fcf0b6d01c2c6112bd4a54d87369867c0ed6c4b5138679ed4ca76bdad04a7b48842a0724ee73dc2185ed
+EBUILD razercfg-0.39-r2.ebuild 2137 BLAKE2B deb76d7fe520261d6eeec1d702720300f4b273b1be7aa19ebfcd4a80594b643ecf8c833e5a775fe82d0e9aeb44f11239d4f9943335a183ec770da3e92fda59e3 SHA512 e2bfdfb681cacb1a6db032803125c9e24329958de2e1a50dfa769a158a5329fb12875a6d55c28c1040376ba05645079fd130932bb80b504280a1d233c2e9a3e1
 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-r2.ebuild
index a5023d502598..2d13385579e2 100644
--- a/sys-apps/razercfg/razercfg-0.39-r1.ebuild
+++ b/sys-apps/razercfg/razercfg-0.39-r2.ebuild
@@ -24,7 +24,9 @@ RDEPEND="${PYTHON_DEPS}
 	udev? ( virtual/udev )
 "
 DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/libusb:1
 	virtual/pkgconfig
 "
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index 8933b2696488..7c2066c7a13c 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -1,5 +1,5 @@
 AUX renameutils-0.12.0-autopoint.patch 250 BLAKE2B f8fb26fc51762e36db1d0450a8c8a61b45059cbc0ae547980609890e56dea12a46fe7993e91f5af48ce813d98f84f6962e24f8489141f9fbcffe1f508d6ef7f5 SHA512 a9cff62242da7d71f05e57bcbd7b10b563c4a0e6262c0ded6c6890ce0f78796bb1b865f66a91dd01db29d5b7d645175e8509d76b30e9c4f60103a6ca9fd9c8b0
 AUX renameutils-0.12.0-typo.patch 659 BLAKE2B a32f67a159e5c213d09d6a70a5b46ba527b618f897d4845efd2b5e12b0c973534de4adcd1f47a2d25a11c081e0873ba9e9bf8ed7bbd54ad44934cc00b1559761 SHA512 0c8a84ec8cbc40c5f51e0a0066ae451ce2f44a2a7d13f73429c60a90dbf02ba0982f00280b16e38125763eeabc850d03f9c8c6f35bd924bd4fac54be85d7ea7d
 DIST renameutils-0.12.0.tar.gz 954114 BLAKE2B 7c65138d9a6de355a72f8e07a6d9b8c1921a8925f7662a26521dcbb37862161ea866e24246cf2a2b3e4c2910231242883bfcea2acef9dda48556faa1d385baae SHA512 8aae157e6ead86a2fbf970ecdb27d6067c2d35c04058ead9a3c0af3d99d466d37d8c4f1da0562ef2bea9cf9bd5f8de4d14340906427df421dba1a5c234c63bd6
-EBUILD renameutils-0.12.0.ebuild 598 BLAKE2B 455ae325bbbddd0365ad6fc928c7dadac33bdcc34403ab3ff75e0ce329cd3f76ce2e1c97b4e2e816f582f6f1ad333a71679f249d34d4c93950540ed91c620453 SHA512 a1c9fd745cece602cebcc908485716786a1f75f918730e956cf769c536b10ee24d5c03bca15d503ded0c3feca06aad76fd4bab7d0b730a88b8d96bcab2b553d9
+EBUILD renameutils-0.12.0.ebuild 588 BLAKE2B 92b0e16d16d0761f656368b38fd87849d8a0d11ebff8847ad9a3b2a0711e0327403261c11ba41edd56e3c9a635adebefe2949133a729b433868c10a500e72f14 SHA512 54589c8db5da6a8b88c0d39182c079d88d7d304810ce74bd3f2a3bb231068da33ac6bdfd1bba801450e21747b57a2f81c4b3e3179e935062da5c6c15ff5f312a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/renameutils/renameutils-0.12.0.ebuild b/sys-apps/renameutils/renameutils-0.12.0.ebuild
index 95b7981085a1..7d0f5dfb332c 100644
--- a/sys-apps/renameutils/renameutils-0.12.0.ebuild
+++ b/sys-apps/renameutils/renameutils-0.12.0.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Use your favorite text editor to rename files"
 HOMEPAGE="http://www.nongnu.org/renameutils/"
 SRC_URI="https://savannah.nongnu.org/download/renameutils/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-DEPEND=">=sys-libs/readline-5.0-r2"
+DEPEND="sys-libs/readline:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-typo.patch
+	"${FILESDIR}"/${P}-autopoint.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-typo.patch" \
-		"${FILESDIR}/${P}-autopoint.patch"
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 11791acfedf3..c8160e718855 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -12,5 +12,5 @@ DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c
 EBUILD shadow-4.6.ebuild 5364 BLAKE2B 8223d8571e15a886bd0fbf6873aad932b2aac80005764bbeaa3405a1dde2d72ebbc55489958c08835c23abfc2fa3fe6e3658caab4ba6bebf368c9d1ad56440fb SHA512 e1181cc34f6a19a0015350467c2595e7a0cac9ad29af0b09b9a1b01a7cd9554aaf375dccd1f2ce424d5c94dd4c5cf382fa7d9a0d18dcafa8835342d57ce5da9e
 EBUILD shadow-4.7-r2.ebuild 5797 BLAKE2B 50ae8f70ef78adeadb61095580bb02f9ffa10eac29a4793918d4248e2e891790364f761808d1f1ac26b1fca5dbadaf6db3f16272f349be6f7f3885a12a568c78 SHA512 0533a37fe59edeee1ea32f3fe86b3f277c7cd40964fdf2f3e17a9e8b5775748d9ffb039beb309e2586e35acea78c8d200b2359246c4bf5c1a1573d2b5ae1b9d0
 EBUILD shadow-4.8-r3.ebuild 5765 BLAKE2B e1795aac463f30754906ea5cb872585bea5ac7ecf6265a7bb536ac1aa06a5ccb8f590e899a44f7a37c088c6c9241cabe1e470910bc63c3e1ee5d4bb6f12eec6c SHA512 59be0960eb5981a63d004475380b5c723d76ac6568589f5482f7e5b7d562c9fcf321e2bbf475b7d08209cde9bfc0509069ed4aa30844ea000f2e16f309616081
-EBUILD shadow-4.8.1.ebuild 5722 BLAKE2B 3aa92cf42b73783d8ba6e765c72f3752b2381613fe8284131e83726b43c9ca37882980e1777b245a36d286ce6cfcba65a420b7a1db884ae35e49f746da13bb18 SHA512 e5c87494406a8edf48af0e70737e74ae16db11d004c70f58a3702554ca30eaef7d840a98b871780ce167a653b51cc9c6d69221c2683001aa3cfce7ad6bc53178
+EBUILD shadow-4.8.1-r1.ebuild 5742 BLAKE2B 3290d5e105fa4ae53f992ced7d24b8cd5110c0b66afc2aade8155148b10b9408badb5b71b7287b783733d204b1d4594a9e3bc6e6014f07f4600373740f18c498 SHA512 329abe6baaf7a6dbb56059c5d60f5e68aa2ad280e46aba08c75086a74c744a6582fd49bc84b065c4f0da9ef188320ccae5a18e561b75d703d3f38c78094a04d0
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8.1.ebuild b/sys-apps/shadow/shadow-4.8.1-r1.ebuild
index b0c1618383b4..58cfc9e73031 100644
--- a/sys-apps/shadow/shadow-4.8.1.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
 DEPEND="
+	virtual/libcrypt:=
 	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 3ac58368847f..9711022a93f2 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 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 4103 BLAKE2B 01ffcc89032428c2590fd847c6899b934286d48cfa73b3c4b87678d181855696c35cd6fce459ebbaa770e621e83165617d9a0c660d6ca76dae5c036f144c557e SHA512 95c6d36eb6d9e1594e5f857954b694d328a12d3aad14a76afb89177d770b16e7452d956035bbe20d97bedf0c7ddc445bfefd21979472e790fadd03babcbc7a55
-EBUILD smartmontools-7.1.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
-EBUILD smartmontools-9999.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
+EBUILD smartmontools-7.0-r1.ebuild 4099 BLAKE2B df7f1f397ba3b8869dc17ae5f4125b7c3e33b8840b52bcd7c554269fa0654a569af0d86db45ff564bf9568ec7979ae218e4ebe0ae4713d2f741205230373a054 SHA512 48411f6a4e66fb624f2dde9c6bbbf152903ccf3266a184b460b46ad68fbcd35b3bf496b3aeda1a96056c3ca40d17c10fe7658de264bae8fcd2d186bbddbc3d02
+EBUILD smartmontools-7.1.ebuild 4107 BLAKE2B f2c64ce957a8cbca5eb593f29bcab037544c1a8aecabb12b45f7105a719a90c6219150d0b40cd3f2d74f186571421d0e276a18bdc448034886ca3a661fcfc9ae SHA512 b5fa1894ffedaec49c69f0f510813af67ce2f455ba0dd2e6eac2fcb590d82fbecb93c76a9c85792f51661f2cc5fa35681679ef959a3f6e6ed66abce396190b58
+EBUILD smartmontools-9999.ebuild 4107 BLAKE2B f2c64ce957a8cbca5eb593f29bcab037544c1a8aecabb12b45f7105a719a90c6219150d0b40cd3f2d74f186571421d0e276a18bdc448034886ca3a661fcfc9ae SHA512 b5fa1894ffedaec49c69f0f510813af67ce2f455ba0dd2e6eac2fcb590d82fbecb93c76a9c85792f51661f2cc5fa35681679ef959a3f6e6ed66abce396190b58
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index b63f007b6df0..a07862703917 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 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}"
+		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
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild
index 9f111458dc66..4cdbb0a02120 100644
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 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}"
+		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
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 9f111458dc66..4cdbb0a02120 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 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}"
+		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
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 78758830c598..8345d1728498 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,12 +1,18 @@
 AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
 AUX 244-efi-gcc-10.patch 3032 BLAKE2B f9fd018c567384171b154809bb95b35c18fc9c3ad7d5c114f5854bb90db2bdafca9d96c3437a9d20a7ea875a3e5646750f29294025fcb657a40dcd7d4ed95282 SHA512 f9bbc9c3be417ff14775de06d3c4088913eff4c6f62e58278420345cbc7b115b706c169faaae9dc17448f895d9cf9b417ee8c04398ec4c206df89f5f3bcfb4a1
+AUX 245-rc1-network-debug.patch 1915 BLAKE2B b4e2fc470e584520c0423b06d00e663fb82e364594626e89632e9db4dd503b55c419f844c5063ca7f8641919ff47d3057f6962e269686829041ea262e75504ae SHA512 d55dac6e5b11d066eff46b0387b64d1cf59b9c4134171b17933447064f0ea0ca774681134be20e0af40f3de03f971778cf358d38bca78107e7129d3d86e7065e
+AUX 245-rc1-sysctl-segfault.patch 942 BLAKE2B 00fc826da41bfe0bb42e86bb839dc441d0762993ddabc227097865061a706a0598e1bd1ef4451b8ba11f702ba66ab1b9281e2141fcffed054c787206bb78966a SHA512 d92f4ac03d1ddb84a9ff2bb90efc92a7d0394165fa0dd7d3fa0739e1480b847e11ec522a3d6dc907998455df19c1b300c046a404f7c4226e77aa10f51fff37a5
 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-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
-EBUILD systemd-243-r2.ebuild 14522 BLAKE2B 9b59d5ad65b13ac99d127ea4c09b3fad87786860c500cac17c4f1d65e86f543c0869a834ffb42e77794a85ed03c2e25a26109773442190f4ab15d09f7d79702f SHA512 5b1cdd515a574121c4d0b3d049100ffba6bb81481c95ba7c8da2de7b007b9110336d65bdf74dde15c29639b76f6e1c9ecaaae28ebf1058f09bf240141e5b10dc
-EBUILD systemd-244.ebuild 14502 BLAKE2B e1605c98deb12f8c3cacc988db985fa3e8a52bccfcb464dd8ba167cf5b8683ca2d51279d6b298185e804ff3d6de3746e252abfd46bd52b3f58b463dec7869a7c SHA512 a06eefa3b8d9043f0aa55a0a8900e8d770c14d0263086cc6718f0418ea7b877d675f3e420e415e208c98f1cd703213303834401df9153742090f39a8a33220db
-EBUILD systemd-9999.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
+DIST systemd-245-rc1.tar.gz 8961356 BLAKE2B ed04166ead57c2f1cc1a1ca2f0041cae134b503d3448ea9fdd799e12d81f45721ee304d4aabd96d3eab8ea1321b283820e8d2a850b41733e40f07fd419f67b95 SHA512 2ef9a295f3897c6642a2fac2e3c73467ece9bc6fc196cc4f3707b9c23af2581eb9f74def78909d57513b67604bf1cf6dc5dbb31c6d435f7997677d09a73d006b
+DIST systemd-stable-244.2.tar.gz 8484718 BLAKE2B 7ba41c443aa3e34379c24eb1590bd1090037a03178dd76cf8324ee50a1d7e82d2da27abdf9ea7c6b9b0b5467d15625dd432739878e8b482636a9f4bae802f2a5 SHA512 fad6c9da7bf7b6f572ea411e70bea7a44e9be0b373cb86cbe5a77a08cd1b5e4f4f3ae6bfa001194e14a9849313a9151e3fdeee62c93f18f15439a657a05783e2
+EBUILD systemd-243-r2.ebuild 14599 BLAKE2B b292513681d3a9f0ff8f47532eee29266f9cae7c498668e871b0fc2a14fe6c36d6b56d2851266ee27fbe634c914a8dd1d97533ac700b83503d98bf72133b3a74 SHA512 833614b3ea2f84fe515d0fb9695818b3f61d5be8139736b7a9dfa7c212e5901fbfb2528c4711aede74572254fc269e24901c5dd644ef6be482d9b653efbe0b9c
+EBUILD systemd-244.2.ebuild 14630 BLAKE2B fb983fee2c66343b740d7f4cd31cc28f00437312f1f33375abc65c3dc3491aab2f6941d09ce398b8151f61369cd372322150aabf094536c4afa64521d3fe070b SHA512 0f100e8266386c466feb02a255e300c27f224cfae62a79afbe3a7179e6bc051b9ac0dc4599aaed50d71a21f468320b03b90c01a3319b199793d0df08cdc91fb6
+EBUILD systemd-244.ebuild 14579 BLAKE2B 4f8355320376c19d670f7a587442f1806a01f2f03d4fc8cafd33c1b83160886710d20df1edf86d00c919691e1d02bd9e57e992b7488e440e84cfde43e84821dd SHA512 634238afd9de2ce6896fd23a44943a359283b338ba08b42496f7163fad0f23de94b19bed502b78ed44d7b3652b69e66281dc08174db42d3071e801561c900a92
+EBUILD systemd-245_rc1-r1.ebuild 14639 BLAKE2B 63ec56aed53d47bde7ea948e20d9af295a5c136bdd9e7abf987c3782103a122440e9eb1ceedc1d58563336450da087e6a4029fc0776ef1ad290d31fd27cb758e SHA512 7f1fda14a18723b5411d5e5b4a44a6952b0fd25f2bbce3892d6378d04b6fc17af5dfb2ff109fffd58dde2305bd894d5a17080c9a5bb8c715ebf3e06e8851c374
+EBUILD systemd-9999.ebuild 14631 BLAKE2B 774d430a7943c43fa83f10d32ebe4124f0f3998f65f059fdd0fdd4cbfacc2f3846e6e78d18b5ede4b0d63496f92b2b2b52fd6239ebaaa158522ad0a1900d74a7 SHA512 0f270c3831370f68f6516ff76db1bc1bb91124203d5555e2f02772d0ffc306c072619a4aa4a7f54bd4dc000ffac19d395b181d40438959199cc4bb7e1a8bfedf
 MISC metadata.xml 2019 BLAKE2B 84de0a0abc3f16fab60db2343d8e1f0dee8a3f03ac97bffd01167820815f4d41d87c118b81041046c8cafa6316fb7e5bfe9d6a5de550bf617ace56ccf69efb0d SHA512 086189b961c0f3be70beb1d86fd36508d0821407243e74cf896360f76ce04be544aac211d60685256080fa75e1ac0ae33211501cc11ee98913f3b8d322ac9f03
diff --git a/sys-apps/systemd/files/245-rc1-network-debug.patch b/sys-apps/systemd/files/245-rc1-network-debug.patch
new file mode 100644
index 000000000000..e65035f21857
--- /dev/null
+++ b/sys-apps/systemd/files/245-rc1-network-debug.patch
@@ -0,0 +1,45 @@
+From 01ec0028d97fa97d2e433659e24a1517b0e2382e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 5 Feb 2020 11:04:50 -0500
+Subject: [PATCH] network: remove unnecessary link->ifname from debug log
+ statements
+
+Since 98b0299479a68ffd414888368907fc776a46b82a, we log the interface
+name automatically via log_link_debug().
+
+Fixes: https://github.com/systemd/systemd/issues/14782
+---
+ src/network/networkd-dhcp-server.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
+index a6dbe2e596c..bee75a6930e 100644
+--- a/src/network/networkd-dhcp-server.c
++++ b/src/network/networkd-dhcp-server.c
+@@ -45,7 +45,7 @@ static int link_push_uplink_dns_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         size_t n_addresses = 0, n_allocated = 0;
+         unsigned i;
+ 
+-        log_link_debug(link, "Copying DNS server information from %s", link->ifname);
++        log_link_debug(link, "Copying DNS server information from link");
+ 
+         if (!link->network)
+                 return 0;
+@@ -99,7 +99,7 @@ static int link_push_uplink_ntp_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         if (!link->network)
+                 return 0;
+ 
+-        log_link_debug(link, "Copying NTP server information from %s", link->ifname);
++        log_link_debug(link, "Copying NTP server information from link");
+ 
+         STRV_FOREACH(a, link->network->ntp) {
+                 union in_addr_union ia;
+@@ -148,7 +148,7 @@ static int link_push_uplink_sip_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         if (!link->network)
+                 return 0;
+ 
+-        log_link_debug(link, "Copying SIP server information from %s", link->ifname);
++        log_link_debug(link, "Copying SIP server information from link");
+ 
+         STRV_FOREACH(a, link->network->sip) {
+                 union in_addr_union ia;
diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
new file mode 100644
index 000000000000..7618b2deba5e
--- /dev/null
+++ b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
@@ -0,0 +1,23 @@
+From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Thu, 6 Feb 2020 19:13:11 +0900
+Subject: [PATCH] sysctl: fix segfault
+
+Fixes #14801.
+---
+ src/sysctl/sysctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index bbcf0c43235..0cdb740d218 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig
+ 
+                 existing = ordered_hashmap_get(*sysctl_options, p);
+                 if (existing) {
+-                        if (streq(value, existing->value)) {
++                        if (streq_ptr(value, existing->value)) {
+                                 existing->ignore_failure = existing->ignore_failure || ignore_failure;
+                                 continue;
+                         }
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index c1ea4fb27ab1..738ac85b5c0c 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -128,6 +128,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/systemd/systemd-244.2.ebuild b/sys-apps/systemd/systemd-244.2.ebuild
new file mode 100644
index 000000000000..6080f4368dec
--- /dev/null
+++ b/sys-apps/systemd/systemd-244.2.ebuild
@@ -0,0 +1,508 @@
+# Copyright 2011-2020 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
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+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 static-libs +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-2.0.1: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}]')
+"
+
+python_check_deps() {
+	has_version -b "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)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-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)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	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
+
+	gen_usr_ldscript -a systemd udev
+}
+
+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 847a85b35192..17788d8dde38 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -128,6 +128,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r1.ebuild
new file mode 100644
index 000000000000..81388352a216
--- /dev/null
+++ b/sys-apps/systemd/systemd-245_rc1-r1.ebuild
@@ -0,0 +1,505 @@
+# Copyright 2011-2020 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=( python3_{6,7,8} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+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 static-libs +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-2.0.1: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}]')
+"
+
+python_check_deps() {
+	has_version -b "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}"/245-rc1-network-debug.patch
+		"${FILESDIR}"/245-rc1-sysctl-segfault.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)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-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)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	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
+
+	gen_usr_ldscript -a systemd udev
+}
+
+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-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index daed59e210c0..2a74ef0ef0b3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -7,14 +7,19 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -128,6 +133,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index d6db825f064f..de752c4b47fd 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,6 +1,4 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
-DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
-EBUILD tuned-2.10.0.ebuild 1260 BLAKE2B 072a755292b5ce009d10ad07e534f556288e2a3c4e9bf39d92e9848f91c5d075d70ed6837824da7e7cef896f231cf48aeae5128e9c82204e5346ab4b8fc87581 SHA512 cd10e1561b88d5791b234ede308c280bbdcafb67e54314c381bec848f57b94e53f26fff3b3998a0852acfc892725fea94516b83a9ae32769918daa0928b328df
-EBUILD tuned-2.13.0.ebuild 1257 BLAKE2B 493f557310decdce8074fb5ef178d0225c422c0bdaf97e862fda9c098a3cf56cebfac65602eccac2a0c97aa3322f5b66ad104c4a0473a92a8cefd07c2e5bc69b SHA512 cd9828ce3304579c10628be032603d0cd41dc75ebe4b929c77d0193d1c2286244939a199d278bf38de1b1f763f28abcc630a5d83d7c0c3d989314a87a7d2d9f6
+EBUILD tuned-2.13.0-r1.ebuild 1328 BLAKE2B 43c9abb31c7253a9fa6c1e6734ade3cbff8e8a4f08756b8eb7e368719c86748637e1073ad5c4a3cbfce719e0ce36fd2a4b8f11c0ed4e6bcbeb19477408854da3 SHA512 fc8f6a57e78f8723a15a1d167fecf59242ec20d2cb70077fda0511907bc765c91d837f0a18d3d6208c24929ff0073ed484fb3c44d09ba245126013120ecf9592
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.10.0.ebuild b/sys-apps/tuned/tuned-2.10.0.ebuild
deleted file mode 100644
index 0d0931ccad3d..000000000000
--- a/sys-apps/tuned/tuned-2.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^PYTHON/s/= python3/= python2/g" \
-		-e "/^DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.13.0.ebuild b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
index fe231367c6c7..89a8dadb552a 100644
--- a/sys-apps/tuned/tuned-2.13.0.ebuild
+++ b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
@@ -19,12 +19,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	${DEPEND}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /sys-apps
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)