gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /sys-apps
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
144 files changed, 1677 insertions, 1164 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 762616273c26..8bc61c07c176 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 202bac9d5a73..27b07726eec9 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,4 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+EBUILD acl-2.2.53-r1.ebuild 1246 BLAKE2B dd11d386218cf76cf495c596892517461f07e0c70c6596fa8570e9d5fbc628fa02e48c0691d580957d318265bc5ce39e0b5d32d5433583d1f21844e44fdebda6 SHA512 817d35922503285465a2848cf544c5dd5e7d2c81c6b0c0b091e1b8d2c546143761a3dab25361e8d458db434763f776fb96248e8f304eac80d5530860dd4842fc
 EBUILD acl-2.2.53.ebuild 1230 BLAKE2B 48c9e7a881e0d12f57c44a6ba93d4082d48152aa613c732102f5bf4cea4c88e6ee4c7ab1d1dfed8e60e233c66b8b3777fdc4dfb8a107e79d0c1a0053377ea1fb SHA512 b5d5a459509e116a3decc93ae6d49abf12f7b74b9f23176db8eeefb4a244cbb266ff6470c8af6cc65af2e553a49d25556fd027667f2c449ff5fc4f62fc647c17
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
new file mode 100644
index 000000000000..4965f72787ce
--- /dev/null
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# filter out -flto flags as they break getfacl/setfacl binaries
+	# (bug #667372)
+	filter-flags -flto*
+}
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable static-libs static)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 1f5de7e511c4..ad21c7c44eca 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -3,5 +3,6 @@ AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45b
 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 2359 BLAKE2B 51ade9db9989ec3613f7d2fdb36b140584550e5aa1ee56fbc0874e2444eb56ae642bc938a27cef5e094c07e111bfcb0b1512314afcde58d809681ad310f1d163 SHA512 35a0f35163df7b904fa32d1dc553b0f447d06e3f2bea8eaad71c9f716c9838603c0d26e06b7f25955584716743991bb7e209005426f5d56e9c79e272440026ca
-EBUILD attr-9999.ebuild 2442 BLAKE2B ab4d3dfa9dc3a5d735a7cb896c703c6d8bc11179c041013e6376d6a181e8bbb2e255b15949602b4eef35b67aefe385f1a03c831c96cc257738580747f80864ca SHA512 acd25c4344146ad1a5746b9b973b655f0c74076bf16dfb30a10eda7290696c608777acf5171ab2c9be03f2785f73fba04cd86a5ffd9039bda2cedc75f9f4504d
+EBUILD attr-2.4.48-r4.ebuild 2361 BLAKE2B 176c9578d1dec432cd8244d409439b59fdb62a25923c9bedb58577b5a56f73bfd851b6d20fd67fe1dbb1caf394f19a2dd90f39879e9314361e60deaa3694517c SHA512 4c2e06df10c9df729159bec80c3c0b2faa4d79c7b7d66f1b2595e3eeb00ed06f890fb06bf5ad7a5eb6dc541425670cd5806e161f4923e8e935a3f6ff9b4abf4d
+EBUILD attr-9999.ebuild 2444 BLAKE2B e14a033fc704cbfe4c1695d7246f7d1250b6232172fc2dd79e533891508e435a4d6f7382832ec654889b06b71d6f0448d320d7f7fea4b2793d5a32fbfa6c5c23 SHA512 3777897c5e5889ee81efcfa8af4814b6856211155d073938c88905776280dea5115837ef621f97c4c885e6f0a318ef723d66674696fcd3e9c983cd6c79f4dbc0
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
new file mode 100644
index 000000000000..61b24dcb0c84
--- /dev/null
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-perl-5.26.patch"
+	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
+)
+
+pkg_setup() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
+}
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	tc-ld-disable-gold #644048
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$($(tc-getREADELF) -V "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 8d4a48d28f08..7a00a2b560ee 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 
 IUSE="debug nls static-libs"
 
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 pkg_setup() {
 	# Remove -flto* from flags as this breaks binaries (bug #644048)
@@ -65,7 +65,7 @@ multilib_src_install() {
 	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
 	if [[ -e ${lib} ]] ; then
 		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$((tc-getREADELF) -sW "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
 		if [[ "${versions}" != *"ATTR_1.0"* || \
 		      "${versions}" != *"ATTR_1.1"* || \
 		      "${versions}" != *"ATTR_1.2"* || \
diff --git a/sys-apps/audio-entropyd/Manifest b/sys-apps/audio-entropyd/Manifest
index a4e139464fca..6b64656b2316 100644
--- a/sys-apps/audio-entropyd/Manifest
+++ b/sys-apps/audio-entropyd/Manifest
@@ -5,4 +5,4 @@ AUX audio-entropyd.init-2 651 BLAKE2B f60cbbd9da6ab7ef56697fff5bab221e51b250a65e
 AUX audio-entropyd.service 127 BLAKE2B b0e3f4efdfeca0c9dae7b71ee78c7a87dcced1e71db874999fdfcf4e903ff3f201bdf7ebbeec59370085ac58a182aa42aa69d69ae17ef6e1c0bd9a3b5787e470 SHA512 991948b7638f90a7f909492374b70a0f6964a3406df1f5794c25b46523e3c09b2a1d89dfd3c08e6f2925fe5d94a59b5645c0a9bee4746e7d670bacb5831f4001
 DIST audio-entropyd-2.0.3.tgz 16681 BLAKE2B 36f9d7942f718af8e828ce6598ab8ea35945de1c60959e7bc2314b2440037f8bb661085a4cad12e62627d935797842616e486180945ff283937b499de163f068 SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf
 EBUILD audio-entropyd-2.0.3-r1.ebuild 947 BLAKE2B 67017e31e12d00b50fcea139f9b9930fc7ba7ceddba85b9c2dfffd840c8120f8a7688a55ec98a10f8b3842a707a0ff3fcc0944c21fc742f0e63935bac6da87be SHA512 760fbc5342f16e493284fb4fa5be1c330aed760eb5a3a8711d799926a8d27c53f4eed033d844ee32dbc84f3b79c9d2db8881fb16dc4ab1e628dbcc7ec8e01139
-MISC metadata.xml 266 BLAKE2B a15e0ba576ca622d025b00ad90837f3e975c4a2cfee5ca560507b5dc25bd80d412b97f4b85d1770a9b2187ecbc3ac1c5ee905b11f920cb1338e76602cafd09ec SHA512 7fc844e1d5523b9131034eb1e43e56f03963042752ddaa7c67be9f5477b1682c2ee17f735d8be2e8b1da5f45c139e9593b84bdc9e4943e1631ea6fedca0dcc95
+MISC metadata.xml 164 BLAKE2B 3a48600bd6abd341532bf50999cc675af3e6cd0858543438fa9a538694c6182a45cded722d30df9917c6e22341b40e27c01cf2af92b187614e21ab499fab9ebe SHA512 ba52b2f852b918c8df281fb5c0519bc9a0e7adcba14d2684aa4e761ba1c00ac24ffccbe6d56123f63a3ab129c7df43a78ecc79a5885f470cd1d422fc97c30700
diff --git a/sys-apps/audio-entropyd/metadata.xml b/sys-apps/audio-entropyd/metadata.xml
index 2b9218a0eced..9386b72447d7 100644
--- a/sys-apps/audio-entropyd/metadata.xml
+++ b/sys-apps/audio-entropyd/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!--maintainer-needed-->
-<longdescription>Audio-entropyd generates entropy-data for the /dev/random device.</longdescription> 
 </pkgmetadata>
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 69116c6d7677..7afbba7ab144 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,8 @@
 DIST checkpolicy-2.9.tar.gz 68735 BLAKE2B 092b7b67ea952be6a829529249f0b209c31245490f263b248cb0208d9f1f4ec922522791c6555c0b913b56b8a0037bfde54a3511940f0be287f13e3a193c8f26 SHA512 8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03
 DIST checkpolicy-3.0.tar.gz 69037 BLAKE2B 30b8a5e19e02472d1cf256636c70f95739098514ef9d630ee5e782085bd09ff58b4ab6b8c97e9fa652e8260211a7803d80eb765e0fd2f1dde9c328682078d3c1 SHA512 196d24638ec7fc88d427637e2308c7a0c5a3d4cc88c372a5f5dc61d6c1e2f895e308b8e06ee9e47d340d65a1b2d4486dc4decfa6074594dda14e46f1308ded89
+DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 EBUILD checkpolicy-2.9.ebuild 1167 BLAKE2B abc8401583d733530e3673cfa96c3059a8c3041578754fe745fb7850bbf92b852cac3458cbd0bbd550589e9830087d36c8e408d094be02a74d6ff396646deee9 SHA512 739189cf5e8d475e2eb3db2a3c323b32e03d4fff9b7684da149fe1d8470666d2359ca91470578ec0aec8b2f6d0c8e865c16016a0187b8eb2fbd0b8a62a2bce66
 EBUILD checkpolicy-3.0.ebuild 1167 BLAKE2B 033bc5b87495376881fa6d0cd2cd0152059478db0fbc262b13dc182955fc02e1a1c14e70b6cf9b756f458ca6631007d910805a744cbb98d739c0309f8a10f455 SHA512 d169a4348be5b8a48f87b244c40b2673857cb7695ef293cfdba084ef9f0db95110ae10857cd1e0cae48d338576fa05c30bdeec5762e7df5f12a4471e52f8b12b
-EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B c592aea38a067321e299b0655a43aaceba2f066d16ab4d4350844ff17bd154b94e1791bd39f7852d890cf46b6891f2f19503848fa9dde3952f44594af6c77d0c SHA512 77e5b9c8156efceabaff0583551ec5cda9c0b5041ce110ed9031d6bc8b7ea934f18383be2c79ccd93525471e71c13dcab6ae257cc9ffd4a56f260c9804c72108
-MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
+EBUILD checkpolicy-3.1.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
+EBUILD checkpolicy-9999.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
+MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
new file mode 100644
index 000000000000..fe88e2f1c073
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20200710"
+
+SEPOL_VER="${PV}"
+SEMNG_VER="${PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libsemanage-${SEMNG_VER}
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 5be101d66c6b..fe88e2f1c073 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -53,5 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
 }
diff --git a/sys-apps/checkpolicy/metadata.xml b/sys-apps/checkpolicy/metadata.xml
index b5ba8a9fac57..9173800ffc42 100644
--- a/sys-apps/checkpolicy/metadata.xml
+++ b/sys-apps/checkpolicy/metadata.xml
@@ -5,5 +5,4 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>SELinux policy compilier</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/chname/Manifest b/sys-apps/chname/Manifest
index 60c645e226b5..3bb72c148c0f 100644
--- a/sys-apps/chname/Manifest
+++ b/sys-apps/chname/Manifest
@@ -1,4 +1,4 @@
 AUX chname-1.1-flags.patch 595 BLAKE2B b56aa968c17f51d4dd370e3f86c53df49a563d359066bce1247c7c25f3c21bddd7b6e0c7876b8678451caeea5f90927886b16b3413d2a8432424fdcf256a727f SHA512 687ea7ad9586ac58bc330cc4256b8452c22306c90c591943ed778543f1a74a8323b2c3fb560e16cf48a7b2a3b274e5f479055085a653d44f32d81c9ff340f6cd
 DIST chname-1.1.tar.gz 8010 BLAKE2B 07f518fcd009bb118a59a10bc1d17cf7c2f1fe0b21516b735122347b45f42ce54e5be35a78739d5c2c7a3d491f9823a62820b84e033d9aca2611a126570217ad SHA512 4194b48189f949a95a1f8037638acbdd4bd3734dbc1cd3eb7642a0a2acaa8ba75e48d43ff01029b64da34b36683da917f52809915108e61973cb1e097b2a0993
 EBUILD chname-1.1.ebuild 578 BLAKE2B a284a7337b0502c59c084c1e251b6dc0d071570e5ef835e1417b6bd45a8a4221a5a3b96c232577c939c87f478478fc5753353001c556d7ab1a171419cd86a980 SHA512 82eeecfdc7ba31684e96b911f2057052ad1993c7d314a984901d096df41fff167557caa338b27c47ecd9521762edb8120ab5d12d7d9e41a2566eb13fd3140c2c
-MISC metadata.xml 364 BLAKE2B fb59ffb539f2287a494a39514ffe184f692089d37ad03ac56b72b427ec715fd9b69bce4dab30473f3d636ffbc9c3e1db03d64e6a82bfa9fbdf4ad58b8f94b264 SHA512 13db11537c2863b19ee9f5088cf0d2202e0bb44d44092e63567e79a8f990f627e3fb7e3324c88e6442baf57f8e40f67d42cc785b4933735c35ca00a6f2f15dba
+MISC metadata.xml 247 BLAKE2B 24c24f913148d8dc5c602fd508b7ac187a695da643b645640644d804bcec5f63952b305ada5b8331b4ad6e14b43b2157d642c4e05a99738bbf5c6aace952f402 SHA512 4bbd4339c61a734c28df01f6a8aca22396b7884cc504f8525810ae0e95c0a2d2ae38d3ba9a4a049b342e8fdac348b288ece67d5adf0494eb3fac6594f5cb7e6e
diff --git a/sys-apps/chname/metadata.xml b/sys-apps/chname/metadata.xml
index 55a2aa03204a..a04600aaae8e 100644
--- a/sys-apps/chname/metadata.xml
+++ b/sys-apps/chname/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">Run a command with a new system hostname. Requires utsname namespaces.</longdescription>
 	<upstream>
 		<remote-id type="github">marineam/chname</remote-id>
 	</upstream>
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index dcad1e348f10..e74226782ae9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,5 +7,5 @@ DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b14
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 EBUILD coreutils-8.30.ebuild 6248 BLAKE2B 3fd8d6648cb5d7ca2dda584a81d8ca154c96453fc73fe6fa35b97a525d2f98ca21fb3a8237c1bc27aa769e1f5373044789b8e51a34782c57dcd268ac278624ad SHA512 7b525a7d2cf84b5af61e7ae00c8c75715ff346881bba15085b0ca17b4ad4b0678adbabeabc53ff1797e7716ea36a02bebf28d6aaa0eee42abb4f62196f2cd933
 EBUILD coreutils-8.31-r1.ebuild 5685 BLAKE2B 8adcf7ff796153278c7c81075e81b1748ec29ec9dd79338d7db87fa92344131220b812049cb0abb847a842ed653501dd22e5d5edd520a7033b10fe8f421a4815 SHA512 9775562def55e2b4cbdaad3ce68058bd8c9a2e8db8bd175ad74fe8446fad49b494d5a654c1ce8faf248310441b1f88ede613bb1ef21938a0c1a07491455ba37c
-EBUILD coreutils-8.32-r1.ebuild 5803 BLAKE2B 6f88db044decf751d5c7941cd4150ecaa1b90c2413629319a8ec20dac9bf00dfecadddb98b30213f928bd305f22c1735bf4ed54a8874078b5cfd652d0d3a79e3 SHA512 4f395a15fdfda6bc2a7f7b11e4e4e0f4f19a9b24d1d803946798f58afa116c98084dbc2bc1b8ce0a15d71909b8a1a17a4747d2d58192164ceabd55a8817a524a
+EBUILD coreutils-8.32-r1.ebuild 5801 BLAKE2B b12e1690fd010c3f69631379e404401cb3f5b5f50854e2c636dad043284c2dda842c9c6fa92406edd7b6bbddd46b2db4756adeb878066feb5c9f9c8c6842d464 SHA512 8c99875c09a0ad2e08aa45c61b6531f1baf0f015cb4af7371d86542d4fc93d0af8c67377a7de671dc3176333ec9fc0412443f7d447ca3c57b5c326096542c03b
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index b083549dbeec..788e78ee045c 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index fa7d670915a5..27ca12f99a91 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -3,4 +3,4 @@ AUX cpint-2.5.3-kernel.patch 1454 BLAKE2B 3a52586bc642fb5ef3df08eb85ab81759557d2
 AUX cpint-2.5.3-prototypes.patch 1008 BLAKE2B 87928ee43fe5fd650dbbf65906172e9c97769eeb1cfff339346904b949fc1dfaefc8a30b28bca54ea0c614242fb739b60b582b6c28de2e28174e7f4d8df3bbca SHA512 ab78d5f9ea13962b2037a4fd67a88968d2fd71184389dcc7824d633eef3f2e129cd99901093656b23c126636ce7692f04c9dc315c698eee259d123ce4b77db3b
 DIST cpint253.tgz 31143 BLAKE2B e1891244857f22664bc80c7520c065fa18afd1d27a44de52fbbf1914104e36129858450998aea06eaeb06307b51867606256f33809cd7093cc6bc588c238f4b2 SHA512 ecaddee3d2b0c408828b9fd4f1c8bf0026ab8f3654f8792ef504ddfaa848a3ee6b4197f93d044768f3dad49b28dcec175246fe20454cbc7baa162c463bebf221
 EBUILD cpint-2.5.3.ebuild 650 BLAKE2B dbaa947d873ffdbae168abba3801a5d4a6dd4565800822ae70f134da0354bf51b3d4614963a9940675df568a6609768a56441116ff7c964586e0c0371f4fc47d SHA512 ad7e8b9960c06413598b1cbaa607ab3bee0826747c5b99071434b865d0b8a163de9259806127f21be7c765ff39c94ea279645915ba94170d1eccba15645fe97b
-MISC metadata.xml 338 BLAKE2B 42f7c7c447b5017a4077b209c8e052020b72efc41d798e566bff085475cb901d8e7e4f6c2cbe53980fd0498c88d0d5123ce4f0740a318d1d3d67a9698981db97 SHA512 b0b29ca2593c1435924d3594cacd8576bd60b050435f732e0e804d407297684d33003d98b7ba2030cbf96c8509f77b5b0526ccd3d25eeb41161644fe633b664b
+MISC metadata.xml 257 BLAKE2B 9c70046221e1979f58651892812a625dfce638a62510e1006db976f8dce6632d7ed5aef61612e9737c1a857fac5bf4da1e97dc1e743df1c3eed0a0b06a307717 SHA512 1e83b08b20ce28c5dbd9f2822e336c3db0e54bfc7a330266a481688e4be62e18004244c5e3e795a48eb86975b225ec51274df20c3221ca4f0fed899fa5c61d8f
diff --git a/sys-apps/cpint/metadata.xml b/sys-apps/cpint/metadata.xml
index 63a4a75d07e5..beb6ce6ed90c 100644
--- a/sys-apps/cpint/metadata.xml
+++ b/sys-apps/cpint/metadata.xml
@@ -5,5 +5,4 @@
 	<email>s390@gentoo.org</email>
 	<name>Gentoo Linux s390 Development</name>
 </maintainer>
-<longdescription>Linux/390 Interface to z/VM's Control Program</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index df8306a23f73..6656ae9c58b6 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,13 +1,20 @@
 DIST c-dvar-9e1a5b4363aaece7169df2b2852944a1434b2df5.tar.gz 24719 BLAKE2B 3688d10d8295bf608d091cbc808dd2a22a535a94d40fcad46735a4f9e6e58ac06f969cd4ae7e65a04dd5719d00b424d902d904553e3e83bd0b93eebf6aed0cc0 SHA512 07e5d8b0b110ae4eab34024cfef05474b6a59a931ce61632bba3d96ed6bf042edf5b21238e2045cde92f1ab91ed45b1d78e2f8fe79f527f0ab6d018dc205608e
+DIST c-dvar-ebcef28b0da11ec20250f2fa710130967ddd8fa9.tar.gz 24584 BLAKE2B 6b9d488b14861084aa48a874d0db97d90ef554df4877650f66631474b12cd9c7d595726e074de4ddc549d7e053984aaa02f0cc0543811842fac468b2e3c3b8a4 SHA512 592ac99b75101e24babb0ab08ede530bf4cd3a31780d7da1e4d4ace04878811ab2db324c91dd962d6d9e433cd05658cc467a272d9ff3d17e2f594bfe08998b3e
 DIST c-ini-43f379396a320940d0661c15780f618f84d29348.tar.gz 14081 BLAKE2B 4d2b63eb5c068505cfddaa1511b95b1a3c646b7325e9efd55b4b5be85312081c148671e40157c757c45ab0128f0a486102267dddf1c3adbc8f91bb7da363a67a SHA512 bdc9412f2e43446f4dcc36f3447047c68f2bbd3c5b278671e3fb5b3d4a09d9724f362bc5d2fae44d5f899d0fe9978c559e3da57ec2eb36ee2d847bbf6af44014
+DIST c-ini-f8336c98a74038a1104283fde284c5b82d6aef92.tar.gz 13957 BLAKE2B 7e0bb2d8b5cd8cdf2aefa48b9e8980327690bbc255937b12b54133014aac9473ddab517a126a0f24a2258cffc263043d643ccacb99c41bb666e4d0c18e62899e SHA512 5abba94f47f5155464e28b4f99ff147f1cd029db9b020c579508eec0f3e9d6be09462a56ed8b9320a4d8ccc0d03a8f959cdb9098fcd828c917f37e2deda90e1c
+DIST c-list-ac7c831398219acd8d63038e866035a6f86f9e21.tar.gz 9218 BLAKE2B 5821032f60a27c696b0e34e2d26250c48df19ad0d8883eb50b5a0ee6acafeb3f570b23db7b0c823ecdd47de6eb0d2d02d5aedf467283e8293e848189af8d59ae SHA512 95a3e03b0b3aefcdaaf350de0b41cdbba081716ff01bf6e2442aaf0340f0411f32f6a06d204614b59af26df921a161b4bee5f83b5145ec2cae485c9954a6709c
 DIST c-list-b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3.tar.gz 9362 BLAKE2B 04a1bca5166ad8b868ebac679e4a1c1f244bfc04ea617030a7cd9ea3765793d21cc2b1ab6c102a1e0fec65860b4d029f398ab6f9815f8fbec82608da59eb7794 SHA512 e1a852fa8e57f1fbe81f2fdc186079d6e4be9d729bb23d3d1f8450fd867dd2c04db3229fc96a80379c7199568c14df472e92a83d0925e2b2692eccc49a35b84d
+DIST c-rbtree-7624b79b26d020a796fe7c624a4f2d3340f3d66b.tar.gz 25835 BLAKE2B 080f8cc5168b40fcc87a3b21f8b8130385f6ccaafe1c229dca4b9a2e8b6294e7100784f9d2e12c336172e5eaa93645f41379e96bf85c622f0c46f27ad9dbaa65 SHA512 e231a040aedbd12309c4b57cd78fbbe931460fd0748f4a7d0f88ebbe5a0f088bdc6f473be94a5e9d9a28c0a8bf31d81a7a9669132b7eddb44a51a9a2e598cbb0
 DIST c-rbtree-fa97402c3faa18c2ddd8325eb66e2bd58a224477.tar.gz 26050 BLAKE2B 2e295550f455185eb97d1f3212d626bc7df94999fc065e814fdaa8c8d3cd14eb288f840e9cee04842cf1dc4b541a88a043d1f70eee36b77fa82f15430335372f SHA512 1fcafde26da46511dd7141280d14d96d7dd08fb7f62f71c2703c8fdb32783f9e6eac883a4adbdfb0b85139d26f89ce99291a28e789a4ec8c31e4a4560c584418
 DIST c-shquote-1d171fe52c23944c3c0be1f2603595f2488a9ff8.tar.gz 10758 BLAKE2B 1f78587e667b74cdb0dcaf82f54fc891840b75b4fff478bf315b5a45b421875ea43b07504330c35cc31c68956899d5c8e1768dcaf863ef6ece23ac56734b8479 SHA512 a0788dcbd7cdab95577564b499cca3ca1039d2b22bb05f277e84ff3868f1f80796ef26236b5aa082057169d8a9f69781f06792f9a3ae8e869d5d721931f3c882
+DIST c-shquote-80d4252f31c74785f0ec8c4578a26f1c16d5941e.tar.gz 10639 BLAKE2B 9a0f64e0af692a0872b5f40236543e551b7eb49134fc31ca6bfcf56b36e5eba1c2445093a089bf4eaa1aa89671270b35a7cf20767377b167c1cc2cec8f72a23a SHA512 1a79cf2c7c5d3f0d901a3947e371717314b1a4015eb0182b3b670c65abf9c054f30870ec73c628d7b2519b506035be45c23267594e76bc3b7d2e6b53a38cb068
 DIST c-stdaux-d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4.tar.gz 13142 BLAKE2B 771c79666d4758e37204aec1149186af8b1b29979ae604b335d3b5e0f78ee934c5fa97e81aa7e4cd19f8eb88f463c2f4a507b93309ae263fae827ee5138c7ac6 SHA512 c486bdddf76522e8242da46b8057a5ee9c9f5f152962a46bb50e0e2e35be5060b8b93d0b2a0d0bcd800abdf8de6e835e68d17d83dc47c6c99e7e0b2f4d91db23
+DIST c-stdaux-ffa3dcc365331e31eb0c0f73ccd258e7a29a162a.tar.gz 13000 BLAKE2B 23f5a264aa4a8c70e8562c62d4c4a3a865e5132febc9709576d4e565a72c171131c0d6292bb9d39a40cf5f3caa2dd6226a5c2e2bb763dd05c0e32e14f8a85725 SHA512 ac51a94b49db7b77c40fc3c1da74ee4a2a5fc8200f51e45d298cff2540fc7de0a348a028709562b8361f99c1978c37fac2de46941c2bd0ce31dabf80d405c042
 DIST c-utf8-1f7e2ff1164bd2161cb480532b2b34cb2074bde1.tar.gz 9462 BLAKE2B 3e1429da756f82123c3aec84c2abdf02af3e131e9004a59434bf6743173082fa4a0c6d43def625da03bf0de1b3c5cfd6f00719dcfb5baced783b3d9dbbc407e6 SHA512 4221c3d366d3cb8bd61a612fcadafbc48ae817cd4770c2710a39b5bdb916a31b8ba17ca55ccac5e54ed88ee9bbcc4a9bbb3ce5b836ccfc570db28d35816cee27
-DIST dbus-broker-22.tar.gz 208274 BLAKE2B af55b906c4e6aea55717bc4bc8de13daa26ef360f6599911b7442442eb4173c3fa2c4e4058846b0202e9f45f638cc91b3a3f8c9818fec13ae09ed7b3111d1e3d SHA512 385fe58a52f3a67832c420288ef96c8ca204b5ee362eb29b38434c92483f968f76402e321fdba65cdc3d876d3e18a428d142264e5692758209be66b9d41b8e07
+DIST c-utf8-9017bab6cef301229e2295bdcb19476466065788.tar.gz 9332 BLAKE2B 34c97e01305b45ae0370b15d9c9e6257497fa9954889252f0344e5d2418d054bed07060b92fd22434581d9d9b8875a4771dd60db161447e7e402e75ff073daee SHA512 11b4eb7342f844bf65205e87de18ef96b685f50884d39dc0a00db2d1f99489d463b3c4a4f196e08c9a7dd39be7e0b372a27c3a666658f6e4a5e03951fb1b4596
 DIST dbus-broker-23.tar.gz 209924 BLAKE2B 44f966c04c34c4dec9916224038418203b55013f07f95331b6143aaf3e4d0a5add8e76a288627f9c6458326fabf4e9db9c235190d281c4ed01a7a325c90bcece SHA512 42bcb085e153f81d59ac8f1dccd707aa1da98d01f5299eeb2fac2f12bad3fd7aa3268a489f4e1dc827c0e3f7000f11989394047ffee3c3c4da9f50bc6d12dfac
-EBUILD dbus-broker-22.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
+DIST dbus-broker-24.tar.gz 210347 BLAKE2B 037ccb389bf1df6dfcc600e363c604d498bff9b5e37ff10f5040acca4917fcd96c03552d769fcf87e50927bac17b8d1fe70f3ec8835c744166518791cc725d81 SHA512 81819f496dd34a43b16e1b3bcc982bb9b8574aec061fef7831b259c2649b05ed8c866795f815de9eb7aff940404811f8b235832121dfabb0672de9b76acb09d8
 EBUILD dbus-broker-23.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
+EBUILD dbus-broker-24.ebuild 1823 BLAKE2B ad632ff22ef82e053e43484564585f11ca46525a17f4dc17c22f6e4a0dd4a42087ec95b6b62ef21e91a31c368ec55b20909df5ba3d9027b41cc356b55c33a6a6 SHA512 d7137fab9904d929a2a64342c20990f1f49b8bab05787cca134214ed82a6b02b9036093b8e83338a4594b3dc428b6c4d1547adf5bff9ce8138e0ce9aa8b04e01
 EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-22.ebuild b/sys-apps/dbus-broker/dbus-broker-24.ebuild
index 509831015999..a5597fc8d1c0 100644
--- a/sys-apps/dbus-broker/dbus-broker-22.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-24.ebuild
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
-		[c-ini]=43f379396a320940d0661c15780f618f84d29348
-		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
-		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
-		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
-		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
-		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
+		[c-dvar]=ebcef28b0da11ec20250f2fa710130967ddd8fa9
+		[c-ini]=f8336c98a74038a1104283fde284c5b82d6aef92
+		[c-list]=ac7c831398219acd8d63038e866035a6f86f9e21
+		[c-rbtree]=7624b79b26d020a796fe7c624a4f2d3340f3d66b
+		[c-shquote]=80d4252f31c74785f0ec8c4578a26f1c16d5941e
+		[c-stdaux]=ffa3dcc365331e31eb0c0f73ccd258e7a29a162a
+		[c-utf8]=9017bab6cef301229e2295bdcb19476466065788
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index dda0e2364f07..b63bc44ff679 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,3 @@
-DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.6-r1.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
-EBUILD diffutils-3.7-r1.ebuild 1203 BLAKE2B 4b90eeab3dac526fdbd0f37c58fdeffeeb70d76b0445a2ca418ce12db1acb4bba3490182e3008312a2c425e6f89459b7dfb348e088a89a42bf2fde5b0347e2c0 SHA512 e6e32a95c89a3ac4ec65ee650d832e10f436e0a96d561ca219b38c0631186a62fc1cc5f87c91313dcac4dedc6682a467ce201ad66895271d3ea437947d76d5f9
-EBUILD diffutils-3.7.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
+EBUILD diffutils-3.7-r1.ebuild 1202 BLAKE2B 8363da9d4ec93ed674cc8a5cf611baa6f3a5a50414a3ffeb05d1526ca61e8a2f67dccef55e879c0709cd89a0a7c7c4f2e59b1bad4f247d8ebc918b42c2784c12 SHA512 5965fa55a0d185bc3b0ba611805df72ef47b34d1f4684d7ec21b4f8e8a7632d47a3862232bff9c3c248a597b15e54b1d524659c1b4b56db15a06a61e11638312
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
deleted file mode 100644
index ad6055ecdcc8..000000000000
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	# required for >=glibc-2.26, bug #653914
-	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 1cd06831e37a..4a5fcb88c029 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
deleted file mode 100644
index ad6055ecdcc8..000000000000
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	# required for >=glibc-2.26, bug #653914
-	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 58fb72293333..052684fc64af 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -6,6 +6,6 @@ DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
 EBUILD dstat-0.7.4-r1.ebuild 1269 BLAKE2B bf9547eff38162ee495b8e8efe8c6180c8c983349d67452379ee32999d4daf5bc77f91db16ca6c2427ab995da6a8057fef81cc39a91ecb68931772dfeb8533f4 SHA512 90cfcbc53830b7b194992e81c81a1c5629111ab5619eb12645873284b8c0604c1dfc6023712ae15a0c9aedf9ac5f4d5bd47361a148d37609d66b419154456fe4
-EBUILD dstat-0.7.4-r2.ebuild 1259 BLAKE2B c839f4ae6c0dd3734a8954a40ee7b4bcf4d4f7c6508a86e97bfbd86f08c003d97ce524fe9a2ac28e9d7ecb9e8b2533875d3b855491db323358409557561e67d1 SHA512 29416045e5f7c956b5ef0bcca1736b8b35b74b32dfc28eaeb102ba8d13b0103f6b5d2761274844d002358872da5e20ccb80031b7fb7c257a98c8c346601d516b
+EBUILD dstat-0.7.4-r2.ebuild 1301 BLAKE2B 19fadb404714fa8c5799d3aed439c37e6cd0c4acc92a6af29d578258c12e2c85bf414aebcd8fc0a26d2e61e8a66694e9eeddf32c0c228c5d6e4391c749b584c9 SHA512 bc0af1d11789d43acf3535d50eac0b3d602ee86686e75bfc53818592bd6f45c6130ee1b2786fb550d1d4e053bff2ba19ab2edea3151b24331c9d205d5a5f458e
 EBUILD dstat-0.7.4.ebuild 1160 BLAKE2B a2b25f7361ea74b2432efeaebeaf095e809c52c46b978d7fdca1c429c47e1ef5d2d77fcdbb19544d6524b2a8f349dc85882d1f323c62681794d15ffd4976a88e SHA512 ad500b7419422236bd4d09795eab2b13e524c0019a9dd11d340201dfa37f5edab781eb37bdf29f46ef734dcac489b467174eb9afc92f281f88a33714e3764f77
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
index 6116fd501610..9ba37f135bac 100644
--- a/sys-apps/dstat/dstat-0.7.4-r2.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -54,3 +54,7 @@ src_install() {
 		dodoc docs/*.html
 	fi
 }
+
+src_test() {
+	python_foreach_impl emake test
+}
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 80defb4639ce..29157012c2dd 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,6 +1,6 @@
 AUX earlyoom 122 BLAKE2B 1e3e121135740b4f56f6929d1389cce42374db03713e7c5c6281a422f0f6ba02db3f04f8d9a72f19c8853795b4debcdf2ccffcdd4f095f425b620e931d51a8c4 SHA512 7dfd1c8aff690d2ed7137b250deac4135c48ca5fd04390468b3ea1569df81316f009e5c70175734c9f8dd21e46a13015905d3daaffe76d67eef936cda670e305
 AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18e8ef72d3dba8c20c8d617b06cc30c95d4c913e07e0e9a9e6fc6f095591538b8b37d7c72e7ac90f9b49f6a4706051280 SHA512 e906c6c4f7d835fb43f09d3c701a1d78b8c2d1e9642d1b7512a2e90094fe41b8f9a811da94af38f5442a976351d6cfd35557ef40a685466ea6ba80dcef5293a1
 DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
-EBUILD earlyoom-1.3.ebuild 958 BLAKE2B a2cb8950f6baefbd6a6d5e85d5f84ac91d9950e66b7fe91c8208a46752dd7983ca90115ba5c6498bfbd7c8f3786252a215df839b0f10ec5b8acc962a65ea45f0 SHA512 a3a216d37067e10db2a9565f42199c28b4c8be950ada0b9d830b1e8645a99cf4150956a9d7aa8536bb60249e57da89a9c668c8073ab5e95f221146a913e745e7
-EBUILD earlyoom-9999.ebuild 886 BLAKE2B 2a826285761d7b737840541c41998cc3f9a742603132b9b464a86f6f31938c37308b1b5301edb604a6d982e6a7b7902372c36969f265e01f6579fb4580eb3c40 SHA512 cdf81c10989a8fa171b57d4865c58789801224720383aa9dd1993a6ff560a90900fc22b7cfdbc6845d285ed365d0df59fce4439fc8b160a2f0355e239296cc54
+EBUILD earlyoom-1.3.ebuild 1000 BLAKE2B e08bb103093f341794f7b2217c3a4c58e3cc9787af17d79f40bb58f8c1580a22c932001d3999138708fb976c53eeeef55a0ae527eb3d14bf738a9028aabc9d28 SHA512 91b46600142a1dd6c1d75a712651a3ebd482005895709ea61a5de10ad1cced895be96cc5d7f13a2a56ea597227db8422c82c4a54067aa046ff8e0af91afe4d58
+EBUILD earlyoom-9999.ebuild 928 BLAKE2B b646e79ee9f63bdefd0911b1460ee8bf92b4f52413287184be5c607c1a86a374ca137e36f3e9ef928ecd33c0f789f807cda52ba6a697b87851bc326dae584c52 SHA512 cd53a996605505f9aa693839831c77f9c824f1a40766d0219e9eecacde041d6a864a60386654761cd54d0350d47ca3d5276daf850dd39c85afe42c1f5f5d14dc
 MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
index 3234d956e495..14280ec05712 100644
--- a/sys-apps/earlyoom/earlyoom-1.3.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.3.ebuild
@@ -17,10 +17,14 @@ else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="systemd docs"
+IUSE="docs systemd test"
 
-DEPEND="docs? ( app-text/pandoc )"
 RDEPEND=""
+DEPEND=""
+BDEPEND="
+	docs? ( app-text/pandoc )
+	test? ( dev-lang/go )
+"
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-test-fixed.patch"
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild
index a54b0d570f73..b9059f99084c 100644
--- a/sys-apps/earlyoom/earlyoom-9999.ebuild
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -17,10 +17,14 @@ else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="systemd docs"
+IUSE="docs systemd test"
 
-DEPEND="docs? ( app-text/pandoc )"
 RDEPEND=""
+DEPEND=""
+BDEPEND="
+	docs? ( app-text/pandoc )
+	test? ( dev-lang/go )
+"
 
 src_compile() {
 	VERSION="v${PV}" emake earlyoom
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index c926c8684831..5a6cb72872b6 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
 EBUILD ed-1.15-r1.ebuild 940 BLAKE2B fc9db3e1436b6b2029b9975b325af87e4a55361b6b359b4342e5d6f13251d21c4903e6dbbb8f45f7629f8507f4ee1f222b20b2c3f47b8919bd53484614fcba4d SHA512 4a1f7a922a10f9e3c6278f3cc633fd5ceb61409247ff39cbb6adf9aeb125ebf71c66466093be701bba4a6b1d0b478c00f22a820ccbde5753c17f935eac15c85b
-EBUILD ed-1.16.ebuild 1021 BLAKE2B 9fe185b453f812c84d385cfc45b16486d278a1f2192c426333a2425d42a9923ef4e976b2c6512e8f961800ca4020b81f9cd3a1737fdce71824b6c1d498e6bdc9 SHA512 a6181209ba7ecce1ad22a25724b7f2d0a16f08966438528f462a306fefe5e35e9bf8ba94f2c5c93ddefb81ef8392ec4973bd58fcce82ac4a103b01bf432b4258
+EBUILD ed-1.16.ebuild 1019 BLAKE2B 31f0dcb440022c33749a8bcf6c80dcc57076a5ea0db108325862a64f1061975355a8223b354c4f1abd10d688ebcf0f940d438420372ab222ae0663e0b55b0855 SHA512 a6225a82dad440f121939f4c0d54a7cf644ea70a5f88e395ace366e1c15c764682f3f0fc059aedcce46f1416383879878704c62fcf458ce96b49265abc90f4af
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index 818a0ec2f921..f25383ee8d41 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 6e1c256499b6..4ba1d3ce6a2e 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,4 +1,5 @@
 AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b
+AUX ethtool-5.8-only-memset-non-NULL-link-settings.patch 703 BLAKE2B b5c2dca415555f1aa7411296abc3501a33018290772c14adc2ca5a73ad39e11a62d1033042ad0ab644b141c9438168edb995a2d2f877ce62ad834c26776a6739 SHA512 c6014e931ff2f96f26b5dde6b5ab99ac7592ff4077af15eb8612ded35186c09490ccbd6d4a00bff46e40da5d18a26c2b6d6e6664f581c7c111ff18e2dd6d049f
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.6.tar.xz 281084 BLAKE2B 1fecc52e9031a3d13cbe6b3c508ebd7fc6dc03b02d4126b3ddd9ef40eedbef151b66f52e80b6570d45ebba09437b587124d2c22817da7d4f3658bd1ff1d3c8a1 SHA512 9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199
 DIST ethtool-5.7.tar.xz 283048 BLAKE2B 1f265ea452ec0d37b4bd4bb4e602a27d2d26144d750940b2c61638524626fffb59c3fbf054472e31ff755260d7cce8f6cdc31ef74a512a3656830b546b4bbe6d SHA512 195e24c48201412e0eaad7d7ca4e530c3a8cf50f3518cfe49d299fd091cf9198007c5d23be95109c735ceb2ccad37ac9f2e9cde0fb36ea426ab17b1dd064d4a9
@@ -6,5 +7,5 @@ DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56
 EBUILD ethtool-5.4.ebuild 457 BLAKE2B ce0d2ef607cc8970596e8a27c677eaa8ca24d03c41d879f107a6c0981ef33cdc75b1a6f63ca402467d0e02a39e253866995867b2242e1f4a5c205bf19011129b SHA512 28e8a1049a95e8d6ab2ea8b2728af57c57c4e271cb1648059289bd176143607b7a332d9efb455f8ed86a1882ff779f1bd6c2d03555c02feb84c24f64bde5be9d
 EBUILD ethtool-5.6-r1.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
 EBUILD ethtool-5.7.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
-EBUILD ethtool-5.8.ebuild 622 BLAKE2B 8ea892470b7f3bdd3ccf19fb3323d390efd1013648e69be44c21e932abb03b4f78ec0f80eb91969107b689bd84820ea79804620af03d544d2f45e87752c020b4 SHA512 ad853f34b5bec671f84692fc6606a532d25bc9825b4e6be8ba0fb60426aa8f89c0e6ce78530cac2e3cee0f9ebe8ac235d1fa0a8a88090ef2da046ed79df1b9e3
+EBUILD ethtool-5.8-r1.ebuild 682 BLAKE2B 23b63341a624085d2733bded18283f0442119947827068a7e34eccd953fc7c0a08296ed5039223dc59db0179e96755d9f5f71a39ce832f96a5f70b4cb06b03e4 SHA512 890996f816dfd11084c0c37c1238d682f77c5d9ccc9eb8d4a1f411fe44b61f22d246574d68a13be850806cb81ca0570b0bb9938ebfde7a73e9873ad3afe4930b
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.8.ebuild b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
index 7fcdd66a7b81..f1dae680c309 100644
--- a/sys-apps/ethtool/ethtool-5.8.ebuild
+++ b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
@@ -9,13 +9,16 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+netlink"
 
 DEPEND="app-arch/xz-utils"
 RDEPEND="netlink? ( net-libs/libmnl )"
 
-PATCHES=( "${FILESDIR}/${PN}-5.8-avoid_bashisms.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.8-avoid_bashisms.patch"
+	"${FILESDIR}/${P}-only-memset-non-NULL-link-settings.patch"
+)
 
 src_configure() {
 	econf $(use_enable netlink)
diff --git a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
new file mode 100644
index 000000000000..573ee645615b
--- /dev/null
+++ b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/740114
+https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=cf12872ebe7d8fac2088e7d2cd5e2a0a5f03499d
+
+--- a/ethtool.c
++++ b/ethtool.c
+@@ -3048,10 +3048,11 @@ static int do_sset(struct cmd_context *ctx)
+ 		struct ethtool_link_usettings *link_usettings;
+ 
+ 		link_usettings = do_ioctl_glinksettings(ctx);
+-		memset(&link_usettings->deprecated, 0,
+-		       sizeof(link_usettings->deprecated));
+ 		if (link_usettings == NULL)
+ 			link_usettings = do_ioctl_gset(ctx);
++		else
++			memset(&link_usettings->deprecated, 0,
++			       sizeof(link_usettings->deprecated));
+ 		if (link_usettings == NULL) {
+ 			perror("Cannot get current device settings");
+ 			err = -1;
+ 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1f527a153089..a1359f482d99 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,16 +2,14 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
 AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
 AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
-AUX file-5.39-add-missing-termios.patch 813 BLAKE2B 6b65d89bcf6b3a5b7d125e05b951d7ea0e06ba821d06e3165a6fedaada07d4bb78a35f1fe541f741e88cc1f5e179215626db35d894bf7aab84b132b9e5afc29d SHA512 a1ee1fe9dab05057d962ba9f8fb811aff49794ca0e8f82bf582e17bba884c73e792230ed90450e16c4203aea7f20dd6cb26dd3a22ca66a19074c6a62fe794dd9
-AUX file-5.39-portage_sandbox.patch 668 BLAKE2B ed7556d2f602d848411a5252825401042bef816601f767bc2d24a8e84be7845c459d1149d9a5adfddb59843474dea0f52aead6c4a17ffb27dbd0c7cf14d9cc0b SHA512 c648b7cdd520a91f1c152e1d098db4a0d1877a473bddb5f8fa511b0f556d7a15b958451e071c25595fe1ac8c2a81b475846c13f415d861dc48184d6b19b8b7b7
-AUX file-5.39-seccomp_sandbox.patch 320 BLAKE2B ab7c89575e61cfcaa4072b33716f1aa9af437541e3248b329d6cb44c62581ab65c7b7d455f5e0bbe95103f15c24a54a15325af8947da614c83f9f4bad7148eb3 SHA512 3219903e1c3d9f8973515871f073b54bb3396550b308dcb307d0d8cdbd7d76bbc35417e9764c8d3adc257fdcb4a5c62aa136f5175c420c54b86ea03fede6b2d4
+AUX file-5.39-add-missing-termios.patch 917 BLAKE2B 12a0dd712fe7b3755e5fa6dcda0d3a5586be36b0e4fee237ba86b9dcc7b533e57f6094e49599489b8563756764c8a7d6c31d9d20245cb3971c4944ee05413cc2 SHA512 a56a617a212f2e0e348d358e09076ea25bd396f426ce4ab7c090ba702d2d20fdc5b425e2a7baac5abc78bab0320fe1b917b511c0a87b40067f7f1489508107e3
+AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
+AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31a6d46bf8d0b047b370edd0bc9ada254ddfdf1de6217e0d1e85a973880c1f55add5c8dbd40b9db4c693c36d15c5250f SHA512 d5742e169c0a5b40e8dfe3830caf5c6ee21d09122ae409c4b3f357cb517abb8a39c6af2ba6a51fa9155437ae6aa5f30b76b1f8f3d31be9bcd6e6e4e666be1a87
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
 DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
 EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
-EBUILD file-5.39-r1.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
-EBUILD file-5.39-r2.ebuild 3336 BLAKE2B 2f9e33e72c810d726bc347c8a5ec715b6c3bcb0e0244cb34b99aae882a8ac85d2551f1740bd698b5198459a8d36558df4616edb1e91dde5db54ad4ad2b478b33 SHA512 1dfd5cca1c66f9a4e97b28a2242c9200f20a009296c018e558f0ce24b7ddf1a2d6f0e9e01488148c9617e58f72a543da1fd042e8163f719c2aa57b4accbf0fe4
-EBUILD file-5.39.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
-EBUILD file-9999.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
+EBUILD file-5.39-r3.ebuild 3421 BLAKE2B fdc83d16ac687dd6704cb7e97b0bfae816a52464a2da83fa735e60114f8775c488f4fb4f7ed357674cb482e8c2910436971db03c0e56a35e017396e3e4ecf912 SHA512 7a9e2909287aa002e8733e1c252413e9e53072ab8a24b0574a2868be105fbb2a8c1b95fe0112757df2074239b6df9769762b03d7e97a05e03421fa168b81ef38
+EBUILD file-9999.ebuild 3327 BLAKE2B 2d1c3d2ca36a831a192f3e867dd1d027166fa3aa70b2fb3ddc250209ca1e65b38caa476560cd05e67814a5bfe3ac6e695df97f8f737f380bc64507e2052b482d SHA512 9dcc56dfd1b5e4c2143e1411aa897ced3f505a74bbe0b3e14d1d565569aead68e4afe48799a9ff32d2c7ba0ddef6a887dd90b855e5ae7a476535df8bd9508f87
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r1.ebuild b/sys-apps/file/file-5.39-r1.ebuild
deleted file mode 100644
index 8333fd922e2c..000000000000
--- a/sys-apps/file/file-5.39-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-	tc-env_build econf "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	if need_build_file; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.39-r2.ebuild b/sys-apps/file/file-5.39-r3.ebuild
index 645a85169629..d9f6397209d1 100644
--- a/sys-apps/file/file-5.39-r2.ebuild
+++ b/sys-apps/file/file-5.39-r3.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -37,13 +37,18 @@ RDEPEND="${DEPEND}
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
-	"${FILESDIR}/${P}-add-missing-termios.patch" #728416
+	"${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
+	"${FILESDIR}/file-5.39-seccomp-musl.patch"
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
 )
 
 src_prepare() {
 	default
-	eautoreconf
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+
 	elibtoolize
 
 	# don't let python README kill main README #60043
diff --git a/sys-apps/file/file-5.39.ebuild b/sys-apps/file/file-5.39.ebuild
deleted file mode 100644
index 98499a3c73df..000000000000
--- a/sys-apps/file/file-5.39.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.39-seccomp_sandbox.patch" #713710
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-	tc-env_build econf "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	if need_build_file; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 8333fd922e2c..71c29604e7d5 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -37,12 +37,16 @@ RDEPEND="${DEPEND}
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
 )
 
 src_prepare() {
 	default
-	eautoreconf
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+
 	elibtoolize
 
 	# don't let python README kill main README #60043
diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch
index e6cba0d4c28c..0614f52dd275 100644
--- a/sys-apps/file/files/file-5.39-add-missing-termios.patch
+++ b/sys-apps/file/files/file-5.39-add-missing-termios.patch
@@ -1,27 +1,30 @@
-From 769e9868c17a471323b81b12cab851c9fd22baf4 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 15 Jun 2020 14:18:45 -0700
-Subject: [PATCH] add missing termios.h include
+From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 18 Jun 2020 16:25:12 +0000
+Subject: [PATCH] PR/168: gyakovlev: Include <termios.h>
 
-on ppc, TCGETS relies on struct termios being complete, on other
-architectures it does not.
-so termios.h should be included before ioctl.h
 ---
- src/seccomp.c      |   1 +
- 1 file changed, 1 insertion(+)
+ src/seccomp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/seccomp.c b/src/seccomp.c
-index e667adf..296f5b3 100644
+index e667adfe4..68c56485d 100644
 --- a/src/seccomp.c
 +++ b/src/seccomp.c
-@@ -33,6 +33,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
+@@ -27,7 +27,7 @@
+ #include "file.h"
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
+ #endif	/* lint */
+ 
  #if HAVE_LIBSECCOMP
- #include <seccomp.h> /* libseccomp */
+@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
  #include <sys/prctl.h> /* prctl */
-+#include <termios.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
++#include <termios.h>
  #include <fcntl.h>
--- 
-2.27.0
-
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/sys-apps/file/files/file-5.39-portage_sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch
index ff2caed413fc..3ea26641671f 100644
--- a/sys-apps/file/files/file-5.39-portage_sandbox.patch
+++ b/sys-apps/file/files/file-5.39-portage-sandbox.patch
@@ -1,28 +1,26 @@
-From 7e1d9d51329a0e0f3d9cd1dbc3f9509251950e81 Mon Sep 17 00:00:00 2001
+From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001
 From: tka <tka@kamph.org>
 Date: Wed, 24 Jun 2020 11:18:45 +0200
 Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
 
-Gentoo-bug: https://bugs.gentoo.org/728978
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+Bug: https://bugs.gentoo.org/728978
 ---
- src/seccomp.c | 3 +++
- 1 file changed, 3 insertions(+)
+ src/seccomp.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/seccomp.c b/src/seccomp.c
-index 68c56485..af55918e 100644
+index db9364ae..7f5d6f26 100644
 --- a/src/seccomp.c
 +++ b/src/seccomp.c
-@@ -227,6 +227,9 @@ enable_sandbox_full(void)
- 	ALLOW_RULE(unlink);
+@@ -229,6 +229,8 @@ enable_sandbox_full(void)
  	ALLOW_RULE(write);
+ 	ALLOW_RULE(writev);
  
 +	// needed by Gentoo's portage sandbox
 +	ALLOW_RULE(getcwd);
-+
  
  #if 0
  	// needed by valgrind
 -- 
-2.27.0
+2.28.0
 
diff --git a/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sys-apps/file/files/file-5.39-seccomp-musl.patch
new file mode 100644
index 000000000000..72836de67e58
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-seccomp-musl.patch
@@ -0,0 +1,37 @@
+From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sat, 5 Sep 2020 17:20:32 +0000
+Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls
+
+---
+ src/seccomp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 68c56485d..db9364ae4 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $")
+ #endif	/* lint */
+ 
+ #if HAVE_LIBSECCOMP
+@@ -220,12 +220,14 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(rt_sigreturn);
+ 	ALLOW_RULE(select);
+ 	ALLOW_RULE(stat);
++	ALLOW_RULE(statx);
+ 	ALLOW_RULE(stat64);
+ 	ALLOW_RULE(sysinfo);
+ 	ALLOW_RULE(umask);	// Used in file_pipe2file()
+ 	ALLOW_RULE(getpid);	// Used by glibc in file_pipe2file()
+ 	ALLOW_RULE(unlink);
+ 	ALLOW_RULE(write);
++	ALLOW_RULE(writev);
+ 
+ 
+ #if 0
diff --git a/sys-apps/file/files/file-5.39-seccomp_sandbox.patch b/sys-apps/file/files/file-5.39-seccomp_sandbox.patch
deleted file mode 100644
index da0a0ff1f284..000000000000
--- a/sys-apps/file/files/file-5.39-seccomp_sandbox.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't call file with seccomp in portage sandbox. This will fail:
-
-  make[2]: *** [Makefile:834: magic.mgc] Bad system call
-
---- file-5.39/magic/Makefile.am
-+++ file-5.39/magic/Makefile.am
-@@ -352,5 +352,5 @@
- 		exit 1; \
- 	    fi; \
- 	  fi)
--	$(FILE_COMPILE) -C -m magic
-+	$(FILE_COMPILE) -S -C -m magic
- 	@rm -fr magic
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 5b633731bfae..c78b4ced2278 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,10 +3,10 @@ AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8af
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
 DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
-DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
 DIST fwupd-1.4.5.tar.gz 2318208 BLAKE2B 1e46137f5b72ff104d920771e54e3123bd0665cafd20c75327682a7e4284be93f8e284947db91892c29a153803013bab8ac45e5a0263fcda33b7491c53dd5558 SHA512 47eb40e8d84dc49af783b661db0fce0fb800c4581929becffb03b79c41ed8bfb0987f40fbb8262292b24af85b7f91978a6979ea7458058ee2bfc1a4353d0bd31
+DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
 EBUILD fwupd-1.3.10.ebuild 4245 BLAKE2B c010711add27bf1c2526f4d3663d01b7cc0326f0099234f50c06f2e792eb59c59dcf510ee18354c5f4f214cf66f8b41faa2f535573400f07f1f16a266010fe07 SHA512 d99af54dc6d51b030d1515db64a8c3d13311fa6cedd8ac3b367b86671aa86205ac2cdac1219da2a27c555679764b6182fd3e2cb76752dc07a8fb750462bca523
 EBUILD fwupd-1.3.11.ebuild 4247 BLAKE2B 61bf6e25d7217e6025669d98086ad77d774ff310662f3335e711e60f6521ab40d1ba2de37058c0630174cb4d7c81ca79d8857c5b49addeb2c73da899ee6daa91 SHA512 94abbbfc2ab9265b0feda0e2e7d67206abff0a2938a11b08ef5e5c861d88e942c034dd0a5dcfa894cb53cb9dabed0106fcd364e643bfe1ce753757c88703560e
-EBUILD fwupd-1.4.4.ebuild 4159 BLAKE2B 36ec02aeb790d9be563a14b22c99cf725d103100e379872dd4dd3e7fc5f46893c161e0e4497d099bb93635e9559ede0c0e118520270f7bd3ff05fe153f7f7d7e SHA512 0e7cff54bc091018f9fa92c2e8c9d03b65bae73906fdfb5ac69920522d8ca7819164376f81864c217338bbeb44accd6662559bdc776cbbcd85aeeca2ab2a3515
 EBUILD fwupd-1.4.5.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098
+EBUILD fwupd-1.4.6.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098
 MISC metadata.xml 1183 BLAKE2B 1d98b79674b3d37f961dfa5f783d12f024865d2f29e53bb5e3de3daa47dbbc7993d0371ac93a7f1fd4411cee9dd0187a31d5904df23ea03ef4cd61e7a75f22dd SHA512 5357a5c7dd3e6578d5eb37296d484b8f5c89b0c619f0da783f642237cb00e72e8c6adc4c463c825959f2dcf58f52fe2f56623a4864b0bd41f26f530b7af51d42
diff --git a/sys-apps/fwupd/fwupd-1.4.4.ebuild b/sys-apps/fwupd/fwupd-1.4.6.ebuild
index 16576fceb82f..246c5406ba15 100644
--- a/sys-apps/fwupd/fwupd-1.4.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.6.ebuild
@@ -9,7 +9,7 @@ inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 47ce4799f44d..db991f5fd845 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -3,5 +3,5 @@ DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922e
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
 EBUILD gawk-5.0.1.ebuild 2222 BLAKE2B e219e0676f2990b4a93f319f88971b5833d4df05e568b0fda47c607dc1889f90ece07ba64e67cd92f40dbd9c3184f45a4e8da83adff6bfaab08ef76cf8be2b94 SHA512 6f05586b66b986c7e0d65362afef1cc5aafb094242df50962fdcfc01e68decaef61b2f55e73b9b5ae88164a05e30ca203c83bfaeb19e7c9364e61c66871dd330
-EBUILD gawk-5.1.0.ebuild 2276 BLAKE2B fb0ef563aa0b7bd80d879c1f58f45696bf5a8be90bc14b1d0af1f3640d5eec92195968b6df381c1c0aa0b982c20bc58a2499728a4639533da1e97722a97cf1b3 SHA512 4a6ffa5d81f0c882409e30af2624693a094c77eedec0f0578cfb6ed319b6b833ddc47a8fff199573de90650fe042f1453e07990d57617da5e799e9d792220a8f
+EBUILD gawk-5.1.0.ebuild 2275 BLAKE2B d4ad442a95e7ec0fdc857b2fa2ff3ca8e2ff7a10bb6816181f6d0b9a20e345e7640b462e1d0ad6e18ceecb99af3fcda10b5e21f04588e1cde23b1478742c95ab SHA512 daa10f044c6f47adcd4a87c57b08ec211ec3ae3faa3d9790b5f555746c592ce38d05801375c15bbbbb3a02f33332da5de62ff305a6a1e31442e9a5bede680b54
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index f922714026fd..388309a2d3d7 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 8cf31d9f5f62..63de115db0be 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 835 BLAKE2B 8a36036b3bbc80261820214473955d90a06618b295535fc21d1937e6a1c30bea64805fb30ef1e07ea8b4d948abb34d317a668b3c6c0a076ead1da2428f2029b2 SHA512 f6b248792bc780986c247deff38d2bf5e58a659379a1394c7e46a7eb9ffa5d83e56d107b68bfeda3edc53e111e0c114d64084a79c63fb0b03f35f85ea7c70c25
-EBUILD gentoo-functions-0.13.ebuild 889 BLAKE2B a3a619bdcdf1e0ecab55afd117b6146d25bd6c609661599893d52445df8f41bc4cbceae5c551b09337f1bdfa4c1ebd538aa96db9d3e8b9f673458e48a34e5bc1 SHA512 629a3a6e1715cc20bad1021aa12337a7ddcbb1baec5b1ab98e14a2cb86f2d725e8a8775f439fdd84f3e750d3a56cd72f068a887cb858ca7c796b0c0ad5775c37
+EBUILD gentoo-functions-0.13.ebuild 887 BLAKE2B bb543171729f4d301c83699996cdaa9730d92b7aa9ed800ae1c04e1ec8e267f6ab0f0fdb50cbad86987e4a18e60b04022f9f3ac0a726f3487410e4aa33364c67 SHA512 8a9ba47904051caa33f129c8edc43c13b5a5e57717ce9336b45e5860476f5cdeb30f2232467d0dbb320dfd129f7617e67a4be359e27e5c3bfbb8fbe71ec47f04
 EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
-MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
+MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index f82252cfe805..33f8915a041e 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index 1cc4955d2ebd..72a9e91e6086 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -11,10 +11,6 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<longdescription lang="en">
-	This package contains base shell functions which are required by
-	all Gentoo systems.
-</longdescription>
 <upstream>
 	<remote-id type="github">gentoo/gentoo-functions</remote-id>
 </upstream>
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 98488b1a21df..082bcf8fea83 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,5 @@
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
-EBUILD grep-3.4.ebuild 1517 BLAKE2B ba4ebc6d4a72db390bcaaecc05e0e024338d268a33cad53ed6763507c8b59330bdc7d651fa2f76f9ca024dc0c12b864e568b0a480003b40a1ce70d2ee7e9c9bc SHA512 7aa92373a0550d84875d5b6be09a11044226925762a08393def1a753db1b59c94074c53915182807a743f086fe46755e8e46feef2a3f6699a754898d4736ac07
+EBUILD grep-3.4.ebuild 1515 BLAKE2B eb01e846dab2fc7654fd5172d8b6dd9ba7c4affa278b28034d708a033604ceaefbda40c0c55500a6bac702e6503ebb6541029bef2faa94dc64405b79d41f970b SHA512 dadb38743f17805e0eb9f7592209645514edc0e36d6e8ccff23dba5e1c32db4cca3469fd7ea90efa10946018a60d3e915fa344963032f72d8dc5dcf8ead03d02
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 8bd9ca9acf66..34e55974da37 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index 69fdf499dff2..402618fafe2a 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -1,8 +1,9 @@
+AUX heirloom-tools-070715-clang.patch 415 BLAKE2B a61a1719a818cacdf2e4edfcb5a2465d39d80aec404a644a9aece3cbdd1e08ec77f9b969624e927b0d953edd83557f62bbc1d7e3ed02ce3e6e0c185e967462ad SHA512 7fb6c22c4df00d01b7fb226bd179e533ebb0a9030f6bd54c2817006538e335f076ab09c0446ca221ecb397e87c369949ab7d795cf733dd2ad43b7bac88fbce5d
 AUX heirloom-tools-070715-gcc-10.patch 7828 BLAKE2B aa08af9904aa1ef031f7b89fa527dee975295d59534bcb98e5db5ea4affd8c022f988caad8a502c332489fda102d17b7bbc7f6df766d8c515f9a1be984fcf977 SHA512 64b75e38585a24c4c854967b0e21bfedbd23d90218ff524f371c74d94e3d05038b140dda4aa23fdbbce64d99b63b80fa4e9895a3aa902903de75d66ca98dfc54
 AUX heirloom-tools-070715-glibc-2.30.patch 376 BLAKE2B 195c37e1d707d05ac85825a51ded198112bd0595d61697c32eed2912a1208c951d5a68ea14a9fcf033aef0a9b7c63ea8efd519d69fd777c81d9bdb8d29a60e28 SHA512 f39a6cc84060e462aa54c2492346b376a42158391bd57c66ee7a5a9922aa8b419ad9bb77f970840cf6b84055500f0f84c3420edd48bbd4ffc49ff747609caceb
 AUX heirloom-tools-070715-glibc-2.31.patch 964 BLAKE2B c235d9c4d035c19617a1bdd403b325e72e692873ee6615b68349d3d6306394dc6783525e7f08f27399876185102a76643c82fec50e5abb16c597a7e391751b00 SHA512 41f651804735fc0992ac07bd549f9a895cfc35ae4de5ff1580826f71ba3e9b1467a9f694edeb6377a2fd4d59c5223b38cfa435279e510a790e6a37cce3f4b307
 AUX heirloom-tools-070715-major.patch 2104 BLAKE2B 88a602e587dc8376e8eb8198308e64a05db642b596e89b8087b30a2d6d16102b18f0b033cce4c1a4711a8ebcbd4a508139a7fb098b1cdcc292ef63d183bbc576 SHA512 7cee022491768031d413a8854a05a34cdbb6061fe30fa8514072efd0056614218e989c3e03fe771ae79a022085460f8bcdbb147fac0dcc6d97ab49703eaa98de
 AUX heirloom-tools-070715-makefile.patch 581 BLAKE2B a74613af222aff0ec7e6e3e1c012bd444a0a1d74e9caa9ac6ee7b3175641f81966527d24dd2d67b88921943579b591e9f2f735bc427f0c8bfa66977078b2d537 SHA512 ab45b3feca27ad855e535ebae77537572b9d1b6b00bd7f973521d477e962691e56ec67ce5d900980b084758643d85db5af790447411374b488f6c440852cdf71
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
-EBUILD heirloom-tools-070715-r3.ebuild 2108 BLAKE2B 226a4dd961a0c3661bfef0da002d04ed9702aac249a1730aa0da5a1452a7a5a40b536fcc69acd090c4f1fa86e4a85581bfa7e4a74a2874e81d817c9cf4fe9b8f SHA512 70f403b00bfffacd55750569f3fb23eaa41d8a43c8e3b0373106bdc1f6a5e0cb190f18fc8955893dba4db1271f9467991b6040bb23d1faa89b4338762d53d881
+EBUILD heirloom-tools-070715-r3.ebuild 2280 BLAKE2B 4f745ecafd918161a812924d8586577e980b9e672431e6dec45cda1b7b9c456c001be486e50e721bdd23a411744155c61abe758471b0883aaca9995e69a29683 SHA512 3532613bc0cb9ff60b5adc134e8a0e5492a44c468d04dca2bfa64d7928ded0fdfe831ef7421369652f1eff44da4126106d13fa64bebd6d046aa3c3b25bb0b205
 MISC metadata.xml 245 BLAKE2B 47a82b79d52e71358e03914aba8d070a655449fec0e7a7285c93eae422f8b5f0e76cabd1decbf65192e4a3e4b97b677fe91d3ba89f26722a626b3f1927b91669 SHA512 33eb3d3f6130c2ddc9f443f89eea14440472c13e005e97ed283db7e365875d2b911b3e1d62f65f63eff15eade03d35f0874f123bdbd54ff4cd7df606a990639c
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
new file mode 100644
index 000000000000..54831eef0805
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/nawk/main.c b/nawk/main.c
+index 9666638..b50b283 100644
+--- a/nawk/main.c
++++ b/nawk/main.c
+@@ -66,7 +66,7 @@ int	mb_cur_max;	/* MB_CUR_MAX, for acceleration */
+ 
+ extern const char badopen[];
+ 
+-int main(int argc, unsigned char *argv[], unsigned char *envp[])
++int main(int argc, char *argv[], char *envp[])
+ {
+ 	unsigned char *fs = NULL;
+ 	char label[MAXLABEL+1];	/* Space for the catalogue label */
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 34e2e70756e4..1374a47e8583 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -28,15 +28,24 @@ PATCHES=(
 	"${FILESDIR}"/${P}-glibc-2.30.patch
 	"${FILESDIR}"/${P}-glibc-2.31.patch
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 # slightly broken
 RESTRICT="test"
 
+src_prepare() {
+	default
+
+	sed -i "s/\bar\b/$(tc-getAR)/g" libwchar/Makefile.mk || die
+}
+
 src_compile() {
 	append-cppflags -D_GNU_SOURCE
 	emake -j1 \
 		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CFLAGS="${CFLAGS}" \
 		CFLAGS2="${CFLAGS}" \
 		CFLAGSS="${CFLAGS}" \
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 73657a3c74a1..da621edbc2c2 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.15.tar.xz 202776 BLAKE2B 3f06bc254fc8e0e8884d9b8bd63b53f23ea4f9a9e1d16f7f7f2ba83ee052f35a85489ffad7b59bb41277ef68b22caa35790513115d5af43fb09cc8d5cdf4ebb0 SHA512 2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B b19c59b3453733e9d1eb6a88ba2a62d526c975222c1a2d4ea58c0d1a5bfb3aa3a39f943aa99c3ae18a65213b640f1d52de90bbb820eb5c39d079b3d2ce9e6198 SHA512 8798779819277de34b892a71395504cee115c1310dbab921a2fe4866967e16d0f40f34e5b13a31496b69b462bd5b944fd1470dd87b425fc21fdbec8372b1a38c
 EBUILD help2man-1.47.15.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
-EBUILD help2man-1.47.16.ebuild 1067 BLAKE2B bced1d136bd6f2bcafd9231857dd21a6a2c230ff51f6d77d47d7f2a6dc986cc655de323accdbbd534df73da4ddd7f5ea41d6cebbb224e1639d418cd4ec5a2940 SHA512 2dcb76c9e2fae8cce8d60a2a3d5fa69727b7054087658af7e48e27b90e8cb4b595699449b67531f5c29d5b1f8fe59e5fa219f9c8025094963111fcd60340e966
+EBUILD help2man-1.47.16.ebuild 1066 BLAKE2B 1b62baa25c49ca724e3d0145b16f6cf545234c422e9b70bfe660fed0826803bceb083dd9f871274efcc5d9cd1b4ab4478c36d6e196a7e0f28652355e48b9cb34 SHA512 95af5d8c023fdc215eaba118a505e1d96cc4919294f0d73a0332b4c9443b033c198f466d66c8923dd56a993f7dc979ce23a307aaac694b8920d6facb6fe8c567
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
deleted file mode 100644
index df194845937c..000000000000
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 29c33cc929f6..cb87c560fb4d 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 1600e951a4bd..229239e008fb 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 301 BLAKE2B c352d3f7e0038ef8f71f6e95376e91513c45914f7d4c31ec0390a0e9745360d7114b3c4e2743d2cb5872241073a3a4087a3240f2f0ef89e3203b5500520d7eb2 SHA512 a20a1a910a7f852844bfd8f03e824e74760c49c5bf7171f1dbfb16976805179ed79a3ae892ba70e99bcd93182bb1d83f491b9a5f7b64e94478172a424c00350e
 DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
-EBUILD hw-probe-1.5.ebuild 2210 BLAKE2B 8ff9c34cfbc97dedca047482c09dca307dec3656aa2e571b79b188e22524df50328736842dc6cfc871c36fd7618add95d6e95e5efa6bd5c906d492b15b996d54 SHA512 3590836c0a90a7d5684ae2b888ddf45ccdeee702fcbfdb2ef842a8ac4bbdd9a0f3458ccefda8ccbf98b9777dc67271c346d290c1157fca6d98a901688b696221
-EBUILD hw-probe-1.6_beta2.ebuild 2377 BLAKE2B f5c5d89f9d74a834b07d999c75e897a5e54c7251b4aebfab6b71efe6eb685b45a394668d1340d5f839f64a22b1de675e42f577040420831d7f55ccda64b41f0c SHA512 8b006d8e8d171707ac97c5fe90a7c997aa12c84b55ae6eb100988070e2a6c5d8c5a2b96fa960541d00f48ac2222b8bc005f0af0ebfa3043c6c16c74614bddf6b
+EBUILD hw-probe-1.5.ebuild 2214 BLAKE2B 8b2051627a39feb3973720423910dd8b9fc33725575bd4003756d4156de6f8b6543e8e003c412d8f81e84f57315ac568a23cffa7b81b7fe0dea3e373f59a0c23 SHA512 ae42f62eaa907b32b2cab911aadd9b863ff92338ea0dedceddb556e63ebe280d4efd6411b0bd31b8f8f236df5af0bbed2958ba37f55de4355ca1f132969afe1b
+EBUILD hw-probe-1.6_beta2.ebuild 2381 BLAKE2B e1da306e2178569bee0d11b5b0253fea11f90774f5f403c7a054461c95f1b5bae6e4aa66d519c218b4839751dbdc0512946c3f33808adba7a1dceac95c6bcb67 SHA512 a02220c7a13c3dd0991f0dbe40aabb7107289e1af7be9e036782ceee1cfe7be47df141cf429ffa0980cd84ab720cdb083401d4dcfa213658f2590cfd98364228
 MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474
diff --git a/sys-apps/hw-probe/hw-probe-1.5.ebuild b/sys-apps/hw-probe/hw-probe-1.5.ebuild
index cd01ab71c9ca..88364d9d246e 100644
--- a/sys-apps/hw-probe/hw-probe-1.5.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils readme.gentoo-r1
+inherit optfeature readme.gentoo-r1
 
 DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
 HOMEPAGE="https://github.com/linuxhw/hw-probe/"
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
index e6accc081c3f..146c6c196eca 100644
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV="${PV/_/-}"
 MY_PV_BETA="${MY_PV/2/}"
 
-inherit eutils readme.gentoo-r1
+inherit optfeature readme.gentoo-r1
 
 DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
 HOMEPAGE="https://github.com/linuxhw/hw-probe/"
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 9192641df54c..0e52159fe8a7 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -1,7 +1,9 @@
 AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8
 DIST ibm-powerpc-utils-1.3.6.tar.gz 320582 BLAKE2B cce656ca7eefda3912f26c6df99112ceef831cac834af4edaf507c28c63d6bbca0d6ae0dd096474b7d3ac45daffb37dbc1068cb33b83f676922e4f27ca46ae2e SHA512 a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977
 DIST ibm-powerpc-utils-1.3.7.tar.gz 322707 BLAKE2B 5f8e9770e35cfd2d07640d228b8cff175fc71c49518d78c3582df30472a7fe2e3c520dae014d73e37992bca5f9dd13c3203e27e286f010ad0e4e95bfc5e6aa37 SHA512 e7ced7568d4a033131a4a543bf3128ffc1d5b1f5baf358b7bb73003e713145d3191dddee63b73d475dc0e257d54dd2470b02b15ba6ba9e49bb1d110091f2a541
+DIST ibm-powerpc-utils-1.3.8.tar.gz 355931 BLAKE2B cb1756640962f55eead8556abb714f938a066d9c63e990ee6467ecdb032eac7058ce8715dc8b8d403e3c03efe98a7af0c7d560158258e7097300befbb04f8472 SHA512 7c9057131315d8fac6154c410562d9cd1807f76241bcc190566ece05b0ddd2ddbe1097749b7e644ccc9691641d40460a877368162e9b951fe790f53f638f635e
 EBUILD ibm-powerpc-utils-1.3.6.ebuild 721 BLAKE2B f588de3dc66e5447732d36f5708bd734d4ee354c007c522f04031134258a5f680bc1d3a4c8306da9cc0d9656634f52d2bddfd3b89147a5d11bc8edd38ea16963 SHA512 23406ddb503be7fb8894772476f4a5501f03f51c7bc8476051fd9f0fe8dc8f31727962975949872e3e73a8c89928cd0aadfae8698cc06408a19f5b74400a6402
 EBUILD ibm-powerpc-utils-1.3.7.ebuild 723 BLAKE2B b06f37eaa4f0abf574780b267f0974a3f262741fede6fc869d5388572bcebabe58d6c98b5723330c465393939b57dc957623bc1c32fb3309e52c4e340a4e2343 SHA512 cff00db14b60565c4c1a54b7e581b9696d2159c2f5d6ab5db7beeaf51119e65e4bdb1dfa5d6280ee1bbad6d1ba79b401cb80939c16a67fc86177668f781a842b
-EBUILD ibm-powerpc-utils-99999.ebuild 663 BLAKE2B e0db28efb5ee62742a17034ab15a4361a0a09e07e9cea27a11c4ef630c23830fabbdb047b573431d35ffbc0b94638c2d286683fc5721acaa30ad0383ac4e4684 SHA512 09002bb35ebf03d9b24b80e84a5445c3134070810eff060cee5e330c4d617c684c5378a07a76431f76f95a9eef1bd9daf52bba12e8382859ee5d2bdf0467d506
+EBUILD ibm-powerpc-utils-1.3.8.ebuild 713 BLAKE2B 0618c04748af322bad45da4433ed663fdbed39a88be52e942d77032d2450712936263e46094b5bd3e0abba47152468c2b8ebcb359bd618337ce5508393179ca2 SHA512 e76a2b5bd8f2dfab91fc474ed721503be370b0aae0ec0818c4fee24e34de116d9052ea44bfe026e5418d9818ea939b9940478b93060e7cac90ae6b49191e509f
+EBUILD ibm-powerpc-utils-99999.ebuild 628 BLAKE2B 9133fb1428cfa3dbdbbb92e576397868da5c6e7ff3f7aef07815b12aa8107f285c0d760134c84f3e6a048e9a053c1d3b73c829176102fc3d0d96086b2e580092 SHA512 d6dd95777501746657027fb2e907e37fe398b2822beeb275bf6e3bb1645ad500d549a4a92b1329a8a28851fec4ee3cf746eb8debc9608ab0b1ac57b9f3130ee8
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild
new file mode 100644
index 000000000000..2e5af45214eb
--- /dev/null
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
+HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
+SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="+rtas"
+
+S="${WORKDIR}/${P//ibm-}"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~ppc ~ppc64"
+
+RDEPEND="
+	!sys-apps/powerpc-utils
+	rtas? ( >=sys-libs/librtas-2.0.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.5-docdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with rtas librtas)
+}
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
index 32fff560a581..4bac682b047b 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
@@ -13,14 +13,11 @@ SLOT="0"
 LICENSE="GPL-2+"
 KEYWORDS=""
 
-DEPEND="
-	sys-devel/bc
-"
 RDEPEND="
-	${DEPEND}
 	!sys-apps/powerpc-utils
 	rtas? ( >=sys-libs/librtas-2.0.2 )
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.5-docdir.patch
 )
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 89908631b601..ffb949c41b91 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,7 +7,7 @@ DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d458
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
 DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152
 EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea
-EBUILD iproute2-5.7.0.ebuild 4487 BLAKE2B 0ddb1f616f9ade4e66ba8dbe81efbd0f617838749643cb0854f53ad6f274f5d3955c30ca81579bb6e9783c155436eaee2088e74e36e8692371e5ee26a81063b0 SHA512 244715b47dacf2518a4f9a94e82bc9f5a8b83efb0f89ab96f4869046da980d5c5ee19937e81ce66d8d31eaa4a2a41ffd9229b923465e40984caeab435c21b98e
+EBUILD iproute2-5.7.0.ebuild 4486 BLAKE2B de60a586079783870193445e86e0d5d11724a29aa625389040a4abf1b05f873ac6fa0ea132c3bb10605930916aa6ba09c1967e290dfd3564cbc18412ec911fe8 SHA512 8b10ac24ac7e694af34833a9436ddbd3ca9a02beb57a90cefa1a139180aa5b88bdbcd07a4dd5daff39947244f39d615be7fc7d5e629ef40f2d9b9dbb9bc24efa
 EBUILD iproute2-5.8.0.ebuild 4495 BLAKE2B a6924b4ba1fc0323026a130d820b5dccc9d81aafaedf20154b320a744327bd3e273431b8e5a95d30e5cd34d7708cb3e2dbf0e0181bde0c9d1e9bc01328c3f426 SHA512 e4c9a3b718cdbe1893749a8669e119e2e1e4a68612cf657fb00c3778e53598cdf150497651eb77e13d8eade420413f0e5f663156f70a03dd6af4513a27e4c75b
 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index ebb54e9e972e..2fbe1b38277b 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 10bb835a002b..279dd869a3ac 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -6,7 +6,7 @@ DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13
 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
 EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257
 EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 604d3d89c6a4a5f579607bdb03563edc51f3d29731dab80e1b202ceaa1658c70c48f84bcf09c8de958ce3acfcdae79224718897f21ef07803eadf07d900428be SHA512 f568ee8f7d27ee59b2c3e408c602a2d4daf8281964dc509ce251b7dd6b3fc35e6babae2c0f5023d6bd0453a1fe842c992366cf7cc633c21145ded70706d80384
-EBUILD kbd-2.2.0-r2.ebuild 1598 BLAKE2B 9bb3f2f83246815e5f0f6835c32f823d5ed9ca87986b953b9d63322df2ebf8c1ee9aa411dc044c5b47cd8b97e4fb3fe855ea331f4475bd1de662317fb9cf7919 SHA512 cd644fabd032ee93c783d197bade61cb14e0a99e9cedfb83b4284de6f7c3eadce8a83489f6e715f73fe8ca45a7b1f22c47b377bc8cfef57d4372961764edc01a
+EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679
 EBUILD kbd-2.3.0-r1.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
 EBUILD kbd-9999.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index ad709279f2d4..b7b82aca99ef 100644
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index a1e82205b974..2392cdc833e4 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,8 +1,9 @@
 AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399075164320ff608ca6ba5f1bca16d206ca975d8f5f9977ec80fcfed5b81146f9649d61e8e88f5f8589368ab1e SHA512 b5d26fda11398d4877821cbe8bd36967bec095d6e6c2489ec8aa4ef968795f0e238a74e2a9c4db8435fc176dc046920a365771a387a25cb1d0ea763210a92483
+AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f065a017bccfdffddbcf76382004c9a7710ff682ed27a502660d7686f544b904a66eb10d50c094152eceb02e9156473380c430a2996720bd384b5 SHA512 344185ea38f4bb6a939b8ce29cf406776b60f193e5e0eaea7ed154fcc4a9be4237bcd2635d2bc614d74a9109fad056674e9356022b46e3bf00fc5db6c964a3de
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 EBUILD kmod-26-r5.ebuild 5110 BLAKE2B 7a17d3e63a234fcbf1adc4d61406c36f10944889f53eb2291875c6a1fce46203e7dc56e53b49a285574a9b3752d51def60f9f064622c102699eed6e0009ce1cc SHA512 02a1dd9ffba6c09c379a685aa46278956727e7cb5c3eae7008e8fb01651b6119d7fde7220165a1eaedf3f70e764028935a6844a4655a3eab03661a19cebabe6d
-EBUILD kmod-27-r1.ebuild 5165 BLAKE2B 0a3e691b6869c2cc05cddb19d1e3aa6dbfb6b7b0341e56d2679cab2905484978d3e8cc088354c00b339f22f13af98af645bbf390657119d2617a34deaa69fc71 SHA512 2e6e14eb5a4442e2509a5d63c9cb16a65687bae5f0e6189597358436cc5e12c3d9f6e70885d1f544a71ace56f9ad2231e61e116358e9f5063772adbdfb755f8d
+EBUILD kmod-27-r2.ebuild 5234 BLAKE2B 5f96f89a384f1a557f88ad9f18ee4590728aaa5deffb9b60c577de3fd2c6851480cb9a382283bfe9131e1e85ccf2839d1304ef78c7769dda5fcacdd311d49e34 SHA512 4620b08ac0dd513232abd07c68b9c3e017c413bb9f583810b44557629cb5a0e006da01805fa5243985cb7a4f7671cf2dde844ef3e6a477730b7136d5125ba59b
 EBUILD kmod-9999.ebuild 5165 BLAKE2B 0a3e691b6869c2cc05cddb19d1e3aa6dbfb6b7b0341e56d2679cab2905484978d3e8cc088354c00b339f22f13af98af645bbf390657119d2617a34deaa69fc71 SHA512 2e6e14eb5a4442e2509a5d63c9cb16a65687bae5f0e6189597358436cc5e12c3d9f6e70885d1f544a71ace56f9ad2231e61e116358e9f5063772adbdfb755f8d
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
new file mode 100644
index 000000000000..dc776b515bc0
--- /dev/null
+++ b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
@@ -0,0 +1,53 @@
+From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Thu, 5 Mar 2020 13:33:10 -0800
+Subject: depmod: do not output .bin to stdout
+
+index_write() relies on fseek/ftell to manage the position to which we
+are write and thus needs the file stream to support it.
+
+Right now when trying to write the index to stdout we fail with:
+
+	depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed.
+	Aborted (core dumped)
+
+We have no interest in outputting our index to stdout, so just skip it
+like is done with other indexes.
+
+While at it, add/remove some newlines to improve readability.
+
+Reported-by: Yanko Kaneti <yaneti@declera.com>
+Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
+---
+ tools/depmod.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index fbbce10..875e314 100644
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
+ 	struct index_node *idx;
+ 	struct kmod_list *l, *builtin = NULL;
+ 
+-	idx = index_create();
++	if (out == stdout)
++		return 0;
+ 
++	idx = index_create();
+ 	if (idx == NULL) {
+ 		ret = -ENOMEM;
+ 		goto fail;
+@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
+ 
+ 	if (count)
+ 		index_write(idx, out);
++
+ 	index_destroy(idx);
++
+ fail:
+ 	if (builtin)
+ 		kmod_module_unref_list(builtin);
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/sys-apps/kmod/kmod-27-r1.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild
index c9e60cdc33f1..721f68de6d5b 100644
--- a/sys-apps/kmod/kmod-27-r1.ebuild
+++ b/sys-apps/kmod/kmod-27-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	#inherit libtool
 fi
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
+IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -63,6 +63,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS="NEWS README TODO"
 
+PATCHES=( "${FILESDIR}"/${P}-depmod-do-not-output-.bin-to-stdout.patch )
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 2243f87d43e3..249232a2a200 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -2,6 +2,7 @@ AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bf
 AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df
 DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
-EBUILD kmscon-8-r1.ebuild 2629 BLAKE2B ef7bdf7dd668ffef089ba1ebc29934be4c1c69762ac5f4609f82fa6fc486f409676bfab47169e79eca7137ec23087652cc57d1301508df239e0db75b8cab9cc2 SHA512 d0df146aafad885a7df195ae7a918391ba34eb67efc88aa314febfd5bc8060472734662ebcdf5b9a91f5d8a4ab322712186cbbc8f0e28276e3890e1104867800
-EBUILD kmscon-8_p20180906.ebuild 2507 BLAKE2B 29a8fcedf189419eae51be86bfc6bebdd008af8d7393000a3c51f02741216b5eaf4971a178ef2bf6ae4303e9d5ab08769d6543da02b929204ef9c6844d6298b9 SHA512 592b95c54321d697ce426b7ced9e09d39bd866b03dc8fae7ca778d90c1cd7fd2f409a1b72cfd92eabd5231abb8675cb9e21268e7fd5eeb32c2c3506492cd190c
+EBUILD kmscon-8-r1.ebuild 2978 BLAKE2B 778c7acd8c5d2fec8d9f3adea8e47f9f1d8b27688f18dcfcf92fca9e0bba15ab32aedff2000907ed88e12f9412ea54fa6d813c29e92fc181ff5222ec8c588fe8 SHA512 e762b0372dd21c6afd8b7a46572d5f005eeb8f18ccaa50f5dd05f9f0fd63bb12d448b12fa44c398ccd50f6a7e2ea4430cfc92322aaaf816643f5058e449fb173
+EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
+EBUILD kmscon-8_p20180906.ebuild 2856 BLAKE2B a794c5360d3214ec1b6928525b5333e721c313d73bcb5df7be4bbc2c48624a2dc52971bb5af43db18ccd50b38cbbc070340491681108d1f9fd63311874ad1fe5 SHA512 a07cce39e1db29f5efe8291a53141b7a3fc0e5d267d45e62bfc5f101966fb4fb6ec60c68e8b2727897d5b3b37093e6915ad3c6d2728ab406da5f93ad83c8ee6b
 MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230
diff --git a/sys-apps/kmscon/kmscon-8-r1.ebuild b/sys-apps/kmscon/kmscon-8-r1.ebuild
index 31ab17695d03..831393bd22a7 100644
--- a/sys-apps/kmscon/kmscon-8-r1.ebuild
+++ b/sys-apps/kmscon/kmscon-8-r1.ebuild
@@ -135,3 +135,11 @@ src_install() {
 	emake DESTDIR="${D}" install
 	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
 }
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild b/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
new file mode 100644
index 000000000000..ec59e73c6192
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT="01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"
+SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+inherit autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
+
+COMMON_DEPEND="
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	>=dev-libs/libtsm-4.0.0:=
+	media-libs/mesa[X(+)]
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl,gbm] )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	systemd? ( sys-apps/systemd )
+	pango? ( x11-libs/pango dev-libs/glib:2 )
+	pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+# args - names of renderers to enable
+renderers_enable() {
+	if [[ "x${RENDER}" == "x" ]]; then
+		RENDER="$1"
+		shift
+	else
+		for i in $@; do
+			RENDER+=",${i}"
+		done
+	fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+	if [[ "x${FONTS}" == "x" ]]; then
+		FONTS="$1"
+		shift
+	else
+		for i in $@; do
+			FONTS+=",${i}"
+		done
+	fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+	if [[ "x${VIDEO}" == "x" ]]; then
+		VIDEO="$1"
+		shift
+	else
+		for i in $@; do
+			VIDEO+=",${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	# Video backends
+
+	if use fbdev; then
+		video_enable fbdev
+	fi
+
+	if use drm; then
+		video_enable drm2d
+	fi
+
+	if use gles2; then
+		video_enable drm3d
+	fi
+
+	# Font rendering backends
+
+	if use unicode; then
+		fonts_enable unifont
+	fi
+
+	if use pango; then
+		fonts_enable pango
+	fi
+
+	# Console rendering backends
+
+	renderers_enable bbulk
+
+	if use gles2; then
+		renderers_enable gltex
+	fi
+
+	if use pixman; then
+		renderers_enable pixman
+	fi
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	# xkbcommon not in portage
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_enable optimizations) \
+		$(use_enable systemd multi-seat) \
+		--with-video=${VIDEO} \
+		--with-fonts=${FONTS} \
+		--with-renderers=${RENDER} \
+		--with-sessions=dummy,terminal
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+}
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/kmscon/kmscon-8_p20180906.ebuild b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
index ad7c9809336b..c24fedc3f965 100644
--- a/sys-apps/kmscon/kmscon-8_p20180906.ebuild
+++ b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
@@ -133,3 +133,11 @@ src_install() {
 	emake DESTDIR="${D}" install
 	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
 }
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 0aad2b9a6858..b2549fca9a3a 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,5 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
-AUX lesspipe.sh 8044 BLAKE2B 9ea7f314c852dee57f9745ee04f4d0779c2e22a138ee9ef479199cc5838cc5edfb08a1a1408ce12f1cf668e4b563abba24fa4ea2ea4abaa1c85a2d3cc3ed608a SHA512 e8b406127f3af3a4c3f9f37c4f165e334311a8da251c5a686b6bfbc24c2cbb202f27aaca5c7b426cc29036b48d944e6be5cbec2839e6e2712aaeb16c5d4522e6
+AUX lesspipe.sh 8058 BLAKE2B d4ead282e5a57891970283e26b82cbf38979612857ce9dadda6a37ef82a879731ec64b30d02c3b99bba98d9791fa3ea6b7df965c7ad43c6de30d7a4835b11dc8 SHA512 6ac05bd89eaced691c47427eb1fa350a25dc3a7e716b41d08ec9d7a7fa9b8aabce9f5e3f073faddecb00a87dd46d8edc5f7856842b8c553fb50a450d6c9669cf
 DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
 DIST less-562.tar.gz 335444 BLAKE2B 4830673d17594aea7424ee88b82bc2e073275a77ed39c067c032a0b79b0d15f8c0d97f98381a57192e985054cd04b3a824ef6c3e6ef796885a9677681a4cb109 SHA512 c9a0f43da0fcdb515e5d4f56a666fa7c8b12d52fd5a1cd4f6cc5f79133376400b0ef24a206c0cf5fd3558fba9a8055f219038bad8c3dadf0504ea96c419c4573
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 68ec0f67926d..a393de07ec7b 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Preprocessor for 'less'. Used when this environment variable is set:
@@ -135,7 +135,7 @@ lesspipe() {
 	*.cpi|*.cpio) cpio -itv < "$1" ;;
 	*.ace)        unace l "$1" ;;
 	*.arc)        arc v "$1" ;;
-	*.arj)        unarj l -- "$1" ;;
+	*.arj)        arj l -- "$1" || unarj l "$1" ;;
 	*.cab)        cabextract -l -- "$1" ;;
 	*.lha|*.lzh)  lha v "$1" ;;
 	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
diff --git a/sys-apps/lssbus/Manifest b/sys-apps/lssbus/Manifest
index 57ac9f135539..14a88352b102 100644
--- a/sys-apps/lssbus/Manifest
+++ b/sys-apps/lssbus/Manifest
@@ -1,3 +1,3 @@
 DIST lssbus-0.1.tar.gz 13576 BLAKE2B ee30ac6463355ce1f8a402af464ad2d6e07070f9227fa9efb9cf7427a6c00b009dce113dbce4955d28a876edaf2f70c0d562ea90cd3b354736dde3c95faaba15 SHA512 1eb294329b628463e8914303a60454221ed17554c94a37bf836b1b0ea797b88abc4853e74a0def50e95bc59fefd85f6acd416a5dd06833cf2049a8ee98bd7e80
 EBUILD lssbus-0.1.ebuild 428 BLAKE2B 8540d589523e91f55dc5c032ffa5d85bbacc82ec1b582740229a869ec59246610005c3d7527c643c5a69e681f81bd1c3717f9be0ef038815c6e1f252f32b8ab5 SHA512 1a0601bc3264c4b0048ce88c78aaca31b8f72a88b9412a87d59f0d74d24e686a882e43d9b3be1e530c438c7032e1217018e54e87dd76a6d17fa496ccfef4b0a4
-MISC metadata.xml 346 BLAKE2B 49559b446131050a8f3bf8cec18412399caa11cbb0a7cad46a85b310127de65999e2c7d49ccc9fc33fd80afc6f5f8fb0af2220c29883980b8c260b4d417e9a30 SHA512 1f826e90dd909ca1428f771415646b48c0815881abba1a9ae4c23a605b5ea64ac950253ae937c4204dfd42c4e9600f9ee5e76d34fa3df941a2df9a5214ecc985
+MISC metadata.xml 241 BLAKE2B a497e68dd9e661fe48604244248f67a96ad686ada5448126b7961c5d2690a6f4e15ffa5c25930c3c2fdf7b9460c66bc7310886642f29a254c5175284fd129003 SHA512 ab884c4915cabda71fb388c2b0eee1b0ed3cb7eebebcef335e256c4895a4498ebda5bf20aad4e8169e9f2917445dd2e9fb4f6ad5d204281bea43fb353668f1f9
diff --git a/sys-apps/lssbus/metadata.xml b/sys-apps/lssbus/metadata.xml
index bc4eda024a56..c9ad33a72059 100644
--- a/sys-apps/lssbus/metadata.xml
+++ b/sys-apps/lssbus/metadata.xml
@@ -5,7 +5,4 @@
   <email>sparc@gentoo.org</email>
   <name>Sparc Team</name>
 </maintainer>
-<longdescription>
-lssbus is a tool to list sbus devices in a manner similar to lspci.
-</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index ed3d32c3644b..8d6685093491 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -5,6 +5,6 @@ DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57a
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
 EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
-EBUILD man-db-2.9.3.ebuild 4081 BLAKE2B 8e530b5d8d340bfcb5c0b8d59431511ef17e1943b61a460b347284f2595c1ae2e8762bcdcd7fbbf9036e97e4f6c006e99cf31c9da854b3d93cecfff4197df37e SHA512 c975a15846e01ad20f52c9d8847d31912bc68d1801465b227aa099b2fe7658e98e75a9bd12185de31528b0df95b7abc9b5833a0586f18ad900944a142ef1d92f
+EBUILD man-db-2.9.3.ebuild 4078 BLAKE2B bee20a7fc9ab500671673f913c9d29f8b87213fc69ae4b3a39a602aba75d7775b08634bbe4124836a3ca95d89891a25dffc7624126b57431fc598471e092a7ff SHA512 de509488cd24634673a5b96302e03bc9459feede909affb743d676b1a1674bdf16357a73e7c3908a4787b5ca6907f90c5de9b374793d0cbf2cae98c4f2cb3c6a
 EBUILD man-db-9999.ebuild 4086 BLAKE2B 94f5ae2c9873bc08e8262bdd049b48363d2c34be2336afbaafc245363b00a317df10770b062c4b011fffed0e2ed54ee666ecfd59feff6cf936608928ec174b04 SHA512 a674880552c2c18f41a0bcfc3a88a4bc94facb61b1e7eca746c3bb3fc5e30c1c0e350fa3ce622d0e362cdefd6f6d46258ff466975ede2f5a75420edb3cf7315b
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
index db42a2d18c3d..37f902d080a3 100644
--- a/sys-apps/man-db/man-db-2.9.3.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 51999c96c7a9..434831b493d3 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,9 @@
 AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d83887dda37a9c2c53c49a27f4ebe00451baf01be59fcd9ed4e47d095e925387fd2032e4e822672d466 SHA512 de97bb70286bd2b772ac6e98346ffcb96dcad95925ebb3bb44e6ffd4cf22b88d27aea103c89973f0fcc6334c98a9399d077e9cd52eaf7da70c5fce3da96ef3a3
 DIST mcstrans-2.9.tar.gz 44451 BLAKE2B e73121351a5d3a09c4754cd0fc6bcdac4b47e3f99d8bd2c40ee9b2bb510095a41721d0dae0d3edb56c36d9e9ef72ece4c69a01298c7f34fe96ccf4883372b1fd SHA512 25a37c6dd7fa23b0599d7e92da78805e1da1605c998edf00777113c8467b1703f634223dff57627337da51e565cf2d1e475698a5a2310966f1f6dcf6687671d1
 DIST mcstrans-3.0.tar.gz 44570 BLAKE2B 82358f6564e42ebfa50647892b35e4788ff9b8636eef3c776dbc6cefff7532906479b5826c1f515d2994611f62100a2622a5cce130bc7dbb4db3afc2167ec072 SHA512 02d9754daf1f85941cc8eea934931b6963d1a2133f6f313a2c7fc6a485687add434d587eeac96bfaf2b490c8e1cea34514a7689f880ebb49ca59ebf9b8956eba
+DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 EBUILD mcstrans-2.9.ebuild 1112 BLAKE2B 28e4b4e11895e7ddc472808e950074ecf831e96fccfb72528b6d946498b96163a0472409cbe1bb6232a84890f95595fede1866a7bf87b5357dc664b1c887f99e SHA512 50d08031a4443b91d3819ab7e49e1e8fbc2dd28bf5fa612d65e080572e732c1832ae2ff173f46b6183d7758b2ae5efe8eebd883c6a8d128170e9ebbfce5f41b0
 EBUILD mcstrans-3.0.ebuild 1112 BLAKE2B 098b5e20768fd54d2a3baaa4dedc56a58cfc36b764c0c8825206c8d10f4b885044d8c4d45abf9339218eaa8fde566a73d03c3f54c245d10aaa667ca25abc740a SHA512 b1a3d390c8f5ef1be73040ad7c4c18f38739d46d1cafd721bb56de422bbca404c686b4172300ee5ac72224c58b0e8c338a0a05b6c7be71fbffcf5ae43f50c774
-EBUILD mcstrans-9999.ebuild 1114 BLAKE2B 4f51cb48990d1dc67cf3e93c78725659f5c722152c911e6732f86fb6041fa97bfe9933e2963df9dd594dee87baf1c824e470347bbf4fb5d56b958a6769ecff81 SHA512 1d892b89f50cd6f0765ee071c6eb6e447cbdd46ad5391fd62c0fd6a848b62e4d3cadf7b441d4fdfc922a1c796017883e18bd380f4fb39046430867359ca6b534
-MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
+EBUILD mcstrans-3.1.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+EBUILD mcstrans-9999.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/files/mcstransd.init b/sys-apps/mcstrans/files/mcstransd.init
index 7c90e771b383..7c90e771b383 100755..100644
--- a/sys-apps/mcstrans/files/mcstransd.init
+++ b/sys-apps/mcstrans/files/mcstransd.init
diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild
new file mode 100644
index 000000000000..c848c15f507c
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20200710"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index e68d520f4372..c848c15f507c 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -31,8 +31,7 @@ DEPEND=">=sys-libs/libsepol-${PV}:=
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
diff --git a/sys-apps/mcstrans/metadata.xml b/sys-apps/mcstrans/metadata.xml
index 4236a792e95c..9a9681c39bd3 100644
--- a/sys-apps/mcstrans/metadata.xml
+++ b/sys-apps/mcstrans/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>
-		MCS translation daemon translates SELinux contexts to human readable format
-	</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
deleted file mode 100644
index 103bd4eedd02..000000000000
--- a/sys-apps/modutils/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4ea50ef9213d090eacddcb72adf95e597547520df2694bb59e7c0c5f01cbb714d8290f71b6d7d5f45592e9cfc1c9a SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374
-AUX modutils-2.4.27-gcc.patch 7007 BLAKE2B 2aade76f6aeee64a4ca25d2adccadbf5bfdaff25ebac4c317fd4d75339fdc8da5d723ffb54e6efe0fad805d5d4d279648de1ea7436df9dd89fd9c5470c2d7027 SHA512 44024ec0e6be1be4ab52a95726dad69670247665241bddcb11030735be58a4c78569dca8399ace467842f933b0fc15f4c3767a465ea433fdcea74c8c68a5d584
-AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
-DIST modutils-2.4.27.tar.bz2 234963 BLAKE2B bc5d91554906d15c258bf27f9b3f28bcc1fdc13413ebcece0f763d28d70f61cc27243fc20eb72e2f28d90cac8f19fccdfd633ea978a0f6c809d10eaea83c24d1 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d
-EBUILD modutils-2.4.27-r2.ebuild 849 BLAKE2B 1bc1d240e26bcbef263c8bc81dcce3cfa58c4f06a2a3a1c6a57bd82ba8237610dfdeb049536cb073b5b74954c65417b8d26d3779fb49e18efa4562043754c025 SHA512 81276c112bd1d328927f2c152b6fe6373077915c5755ee05d7f1ba6030b72a06946dd5fa332875754bfeff67b3880e9b234abcfc8b6c184c774db4affeef31ec
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/modutils/files/modutils-2.4.27-flex.patch b/sys-apps/modutils/files/modutils-2.4.27-flex.patch
deleted file mode 100644
index c07e929b8b42..000000000000
--- a/sys-apps/modutils/files/modutils-2.4.27-flex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Taken from Debian.
-
-Build with newer flex versions.
-
---- modutils-2.4.27.0.orig/genksyms/lex.l
-+++ modutils-2.4.27.0/genksyms/lex.l
-@@ -130,6 +130,7 @@
- 
-   static int suppress_type_lookup, dont_want_brace_phrase;
-   static struct string_list *next_node;
-+  static int next_token = 0;
- 
-   int token, count = 0;
-   struct string_list *cur_node;
-@@ -144,7 +145,12 @@
-     }
- 
- repeat:
--  token = yylex1();
-+  if (next_token != 0) {
-+    token = next_token;
-+    next_token = 0;
-+  }
-+  else
-+    token = yylex1();
- 
-   if (token == 0)
-     return 0;
-@@ -425,7 +431,7 @@
- 	    {
- 	      /* Put back the token we just read so's we can find it again
- 		 after registering the expression.  */
--	      unput(token);
-+	      next_token = token;
- 
- 	      lexstate = ST_NORMAL;
- 	      token = EXPRESSION_PHRASE;
diff --git a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch b/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
deleted file mode 100644
index e2d5a37e89f5..000000000000
--- a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Fix building with newer gcc versions.
-
-Most changes taken from Debian.
-
---- a/obj/obj_ia64.c
-+++ b/obj/obj_ia64.c
-@@ -127,6 +127,7 @@
- 	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
- 
-     default:
-+	;
-     }
-     return (-1);
- }
---- a/depmod/depmod.c
-+++ b/depmod/depmod.c
-@@ -1133,7 +1133,7 @@
- 
- 		for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
- 			if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
--				((char *)ksym->name) += 8;
-+				ksym->name = ((char *)ksym->name) + 8;
- 			assert(n_syms < MAX_MAP_SYM);
- 			symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
- 		}
-@@ -1265,7 +1265,7 @@
- 				 * error.  Use the error() routine but do not count
- 				 * any errors.  Remove in 2.5.
- 				 */
--				int save_errors = errors;
-+				int save_errors = error_count;
- 				if (!quiet && nberr == 0)
- 					error("*** Unresolved symbols in %s",
- 					      ptmod->name);
-@@ -1274,7 +1274,7 @@
- 				nberr++;
- 				if (flag_unresolved_error)
- 					ret = 1;
--				errors = save_errors;
-+				error_count = save_errors;
- 			}
- 		}
- 		verbose("%s\n", ptmod->name + skipchars);
-@@ -1675,6 +1675,6 @@
- #else
- int main(int argc, char **argv)
- {
--	return depmod_main(argc, argv) || errors;
-+	return depmod_main(argc, argv) || error_count;
- }
- #endif	/* defined(COMMON_3264) && defined(ONLY_32) */
---- a/genksyms/genksyms.c
-+++ b/genksyms/genksyms.c
-@@ -45,7 +45,7 @@
- int flag_debug, flag_dump_defs, flag_warnings;
- int checksum_version = 1, kernel_version = version(2,0,0);
- 
--static int errors;
-+static int num_errors;
- static int nsyms;
- 
- static struct symbol *expansion_trail;
-@@ -458,7 +458,7 @@
-       va_end(args);
-       putc('\n', stderr);
- 
--      errors++;
-+      num_errors++;
-     }
- }
- 
-@@ -476,7 +476,7 @@
-       va_end(args);
-       putc('\n', stderr);
- 
--      errors++;
-+      num_errors++;
-     }
- }
- 
-@@ -597,5 +597,5 @@
- 	      nsyms, HASH_BUCKETS, (double)nsyms / (double)HASH_BUCKETS);
-     }
- 
--  return errors != 0;
-+  return num_errors != 0;
- }
---- a/include/util.h
-+++ b/include/util.h
-@@ -39,8 +39,8 @@
- extern int xftw(const char *directory, xftw_func_t);
- 
- /* Error logging */
--extern int log;
--extern int errors;
-+extern int logging;
-+extern int error_count;
- extern const char *error_file;
- 
- extern int flag_verbose;
---- a/insmod/insmod.c
-+++ b/insmod/insmod.c
-@@ -275,7 +275,7 @@
- 		if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
- 			gplonly_seen = 1;
- 			if (gpl)
--				((char *)s->name) += 8;
-+				s->name = ((char *)s->name) + 8;
- 			else
- 				continue;
- 		}
-@@ -1679,7 +1679,7 @@
- 	error_file = "insmod";
- 
- 	/* To handle repeated calls from combined modprobe */
--	errors = optind = 0;
-+	error_count = optind = 0;
- 
- 	/* Process the command line.  */
- 	while ((o = getopt_long(argc, argv, "fhkLmnpqrsSvVxXyYNe:o:O:P:R:",
-@@ -2064,7 +2064,7 @@
- 		goto out;
- 	/**** No symbols or sections to be changed after kallsyms above ***/
- 
--	if (errors)
-+	if (error_count)
- 		goto out;
- 
- 	/* If we were just checking, we made it.  */
-@@ -2123,10 +2123,10 @@
- 		test_read.m.read_start = m_addr + sizeof(struct module);
- 		test_read.m.read_end = test_read.m.read_start + sizeof(test_read.data);
- 		if (sys_init_module(m_name, (struct module *) &test_read)) {
--			int old_errors = errors;
-+			int old_errors = error_count;
- 			error("has persistent data but the kernel is too old to support it."
- 				"  Expect errors during rmmod as well");
--			errors = old_errors;
-+			error_count = old_errors;
- 		}
- 	}
- 
-@@ -2152,7 +2152,7 @@
- #else
- 	init_module(m_name, f, m_size, blob_name, noload, flag_load_map);
- #endif
--	if (errors) {
-+	if (error_count) {
- 		if (!noload)
- 			delete_module(m_name);
- 		goto out;
---- a/insmod/kallsyms.c
-+++ b/insmod/kallsyms.c
-@@ -80,7 +80,7 @@
-     error_file = "kallsyms";
- 
-     /* To handle repeated calls from combined modprobe */
--    errors = optind = 0;
-+    error_count = optind = 0;
- 
-     /* Process the command line.  */
-     while ((c = getopt_long(argc, argv, "Vh",
---- a/insmod/modprobe.c
-+++ b/insmod/modprobe.c
-@@ -1023,7 +1023,7 @@
- 		if (quiet)
- 			my_argv[my_argc++] = "-q";
- 
--		if (log)
-+		if (logging)
- 			my_argv[my_argc++] = "-s";
- 
- 		if (insmod_opt) {
---- a/insmod/rmmod.c
-+++ b/insmod/rmmod.c
-@@ -261,9 +261,9 @@
- 	read_parm.m.read_start = mp->sym->value;
- 	read_parm.m.read_end = read_parm.m.read_start + datasize;
- 	if (sys_init_module(module, (struct module *) &read_parm)) {
--		int old_errors = errors;
-+		int old_errors = error_count;
- 		error("has persistent data but the kernel is too old to support it.");
--		errors = old_errors;
-+		error_count = old_errors;
- 		return(0);
- 	}
- 
---- a/util/logger.c
-+++ b/util/logger.c
-@@ -31,10 +31,10 @@
- 
- /*======================================================================*/
- 
--int log;
-+int logging;
- static int silent;
- 
--int errors;
-+int error_count;
- const char *error_file;
- const char *program_name;
- 
-@@ -75,7 +75,7 @@
- 
- 	if (silent)
- 		;
--	else if (log) {
-+	else if (logging) {
- 		char buf[2*PATH_MAX];
- 		int n;
- 
-@@ -100,7 +100,7 @@
- 		putc('\n', stderr);
- 	}
- 
--	errors++;
-+	error_count++;
- }
- 
- void lprintf(const char *fmt,...)
-@@ -108,7 +108,7 @@
- 	va_list args;
- 
- 	if (silent);
--	else if (log) {
-+	else if (logging) {
- 		char buf[2*PATH_MAX];
- 		va_start(args, fmt);
- 		vsnprintf(buf, sizeof(buf), fmt, args);
-@@ -132,5 +132,5 @@
- #ifdef STOREMSG
- 	atexit(dumpmsg);
- #endif
--	log = 1;
-+	logging = 1;
- }
---- a/obj/obj_kallsyms.c
-+++ b/obj/obj_kallsyms.c
-@@ -200,8 +200,8 @@
- 
-     /* Initial contents, header + one entry per input section.  No strings. */
-     osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
--    a_hdr = (struct kallsyms_header *) osec->contents =
--    	xmalloc(osec->header.sh_size);
-+    osec->contents = xmalloc(osec->header.sh_size);
-+    a_hdr = (struct kallsyms_header *) osec->contents;
-     memset(osec->contents, 0, osec->header.sh_size);
-     a_hdr->size = sizeof(*a_hdr);
-     a_hdr->sections = loaded;
-@@ -275,8 +275,8 @@
- 	a_hdr->symbol_off +
- 	a_hdr->symbols*a_hdr->symbol_size +
- 	strings_size - strings_left;
--    a_hdr = (struct kallsyms_header *) osec->contents =
--	xrealloc(a_hdr, a_hdr->total_size);
-+    osec->contents = xrealloc(a_hdr, a_hdr->total_size);
-+    a_hdr = (struct kallsyms_header *) osec->contents;
-     p = (char *)a_hdr + a_hdr->symbol_off;
-     memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
-     free(symbols);
---- a/obj/obj_ppc.c
-+++ b/obj/obj_ppc.c
-@@ -25,6 +25,7 @@
- #include <obj.h>
- #include <util.h>
- #include <assert.h>
-+#include <stdlib.h>
- 
- 
- /*======================================================================*/
-@@ -255,7 +256,8 @@
-   archdata_sec->header.sh_size = 0;
-   sec = obj_find_section(f, "__ftr_fixup");
-   if (sec) {
--    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+    archdata_sec->contents = xmalloc(sizeof(*ad));
-+    ad = (struct archdata *) (archdata_sec->contents);
-     memset(ad, 0, sizeof(*ad));
-     archdata_sec->header.sh_size = sizeof(*ad);
-     ad->__start___ftr_fixup = sec->header.sh_addr;
diff --git a/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch b/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch
deleted file mode 100644
index 7af4599c7154..000000000000
--- a/sys-apps/modutils/files/modutils-2.4.27-no-nested-function.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch by the PaX team to get rid of executable stacks.
-
---- modutils/insmod/insmod.c
-+++ modutils/insmod/insmod.c
-@@ -366,18 +366,21 @@ static void hide_special_symbols(struct 
- 			sym->info = ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
- }
- 
-+static struct obj_file *load_map_file;
-+
-+static int load_map_cmp(const void *a, const void *b) {
-+	struct obj_symbol **as = (struct obj_symbol **) a;
-+	struct obj_symbol **bs = (struct obj_symbol **) b;
-+	unsigned long aa = obj_symbol_final_value(load_map_file, *as);
-+	unsigned long ba = obj_symbol_final_value(load_map_file, *bs);
-+	return aa < ba ? -1 : aa > ba ? 1 : 0;
-+}
-+
- static void print_load_map(struct obj_file *f)
- {
- 	struct obj_symbol *sym;
- 	struct obj_symbol **all, **p;
- 	struct obj_section *sec;
--	int load_map_cmp(const void *a, const void *b) {
--		struct obj_symbol **as = (struct obj_symbol **) a;
--		struct obj_symbol **bs = (struct obj_symbol **) b;
--		unsigned long aa = obj_symbol_final_value(f, *as);
--		unsigned long ba = obj_symbol_final_value(f, *bs);
--		 return aa < ba ? -1 : aa > ba ? 1 : 0;
--	}
- 	int i, nsyms, *loaded;
- 
- 	/* Report on the section layout.  */
-@@ -425,7 +428,9 @@ static void print_load_map(struct obj_fi
- 				*p++ = sym;
- 
- 	/* Sort them by final value.  */
-+	load_map_file = f;
- 	qsort(all, nsyms, sizeof(struct obj_file *), load_map_cmp);
-+	load_map_file = NULL;
- 
- 	/* And list them.  */
- 	lprintf("\nSymbols:");
diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/sys-apps/modutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/modutils/modutils-2.4.27-r2.ebuild b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
deleted file mode 100644
index 562adb39b3d4..000000000000
--- a/sys-apps/modutils/modutils-2.4.27-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Standard kernel module utilities for linux-2.4 and older"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/kernel/modutils/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/kmod"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc.patch
-	"${FILESDIR}"/${P}-flex.patch
-	"${FILESDIR}"/${P}-no-nested-function.patch
-)
-
-src_configure() {
-	econf \
-		--prefix=/ \
-		--disable-strip \
-		--enable-insmod-static \
-		--disable-zlib
-}
-
-src_install() {
-	einstall prefix="${D}"
-	rm -r "${ED}"/usr/share/man/man2 || die
-	dodoc CREDITS ChangeLog NEWS README TODO
-}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index aa9576d9bd7e..9ea431acc408 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,7 @@
 AUX moreutils-0.63-respect-env.patch 657 BLAKE2B 2f33bb68f3d23f0fa45849fd5d5fb63f8cdbb27b3c28eb92e132d632aa0b9487ecf85c9b9cdfa2bcebc009be4a5ce5da2407742b02f52352dd00a88f84ba1eff SHA512 e9cffcba65d224daa5bba7f15d9e8b39cd18ac2f0e25b91aae6e49017b8c6edb4eff1458c68832e207ec5ed4bca193df3f01ddf4851639509c70cdc967befa8a
+AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
+DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
+EBUILD moreutils-0.64.ebuild 1675 BLAKE2B 46a101760eef9ec2e51907f10c4665fc1ebd3505ccdd84693b3eac869e395b8c0fd325ff9d58664ab41c5e62ab51df9205220d56de8d52fc5ca93464e65d3c86 SHA512 1a31463fe27cd40da4b222ec02586c24e72f35c7278e1e1b71b7bcfa50bca3875c506827addb0572f61eac873ac9d72407989ca55787e31542b775b79a293e3e
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch
new file mode 100644
index 000000000000..ea699d2c5e8d
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch
@@ -0,0 +1,13 @@
+diff --git a/is_utf8/Makefile b/is_utf8/Makefile
+index 13b1021..f0a111e 100644
+--- a/is_utf8/Makefile
++++ b/is_utf8/Makefile
+@@ -37,7 +37,7 @@ LINKERNAME = lib$(NAME).so
+ SONAME = $(LINKERNAME).$(VERSION)
+ REALNAME = $(SONAME).$(MINOR).$(RELEASE)
+ 
+-CC = gcc
++CC ?= gcc
+ CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
+ 
+ $(NAME): $(OBJ)
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
new file mode 100644
index 000000000000..ad2f9c8167d9
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
+# Not available at time of release
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	app-admin/eselect
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.64-respect-env.patch"
+)
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+
+	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
+}
+
+pkg_postinst() {
+	# try to make sure $EDITOR is valid for vipe (bug #604630)
+	eselect editor update
+}
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index f17a73c65584..0e83085342d0 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -6,4 +6,4 @@ AUX netplug-2 715 BLAKE2B df2ffc7a904a86bedb5c160ad0ba8a2d49a8125ed3042f85a361a6
 DIST netplug-1.2.9.2.tar.bz2 22332 BLAKE2B 3a4232178e782417e30da3dc33361c4043d5ff9bb610c2f9a82281d395af470ddeab9cf12f91ef4a18f4fe6ff49f85b7015fecc7018b1b561e2e7f179d8d206b SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c
 EBUILD netplug-1.2.9.2-r2.ebuild 1377 BLAKE2B 1ae7cc9e0b60712758d738334291d77c70f3f80da431767cea67b1a679aba91a73359f131b7be0f110fdd8062a103716e970026a83c40f2980d9752107dd73c1 SHA512 33cc9f8c2eff68ef1ea16873db91aa7116aa2fbecd540a100f5db38bcd3421e242e0f5b5272e386d5a66ad29f0b90ce9af4f41c4e548aa171b35e9ac0526183f
 EBUILD netplug-1.2.9.2-r3.ebuild 1482 BLAKE2B e8824dcc19b0bcf8ea470ad12f9397bc0daed15a2dc290496e05be3a6ce3b25475f1b6a085dc1fb6d7e0610412aa7bd01e41a1559f31a103d3961d92fc8560a3 SHA512 88cada59afc0e373415eb14955141967ebe541bda2f1669354e73cb5018fbca88afb2938be6bf3919050f0878e70c37fdf31d2624c14b6690803fa058d429da0
-MISC metadata.xml 367 BLAKE2B 5d55fc1e2c617f0957b0d73d2f1bbe9147989dd5d8827fadbd399c71f4721045db39df680166baacc972db498331e48b29fdb4bbe7b21454c20fcf985c79d77e SHA512 d2cdfcaac3690abf52d3ee9ebd7086815b84802d4918778911b63d4ecb36ac8928178ac7d02ebbf3823ee50ef2917069a20a4cdce319097298d7f66ad15e272c
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/sys-apps/netplug/metadata.xml b/sys-apps/netplug/metadata.xml
index 04c54cf1d796..95aa13f6c5ef 100644
--- a/sys-apps/netplug/metadata.xml
+++ b/sys-apps/netplug/metadata.xml
@@ -5,7 +5,4 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<longdescription lang="en">
-		Brings up/down ethernet ports automatically with cable detection
-	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/newrelic-sysmond/Manifest b/sys-apps/newrelic-sysmond/Manifest
index 1eef0374eb3a..1e1a2e85ba8a 100644
--- a/sys-apps/newrelic-sysmond/Manifest
+++ b/sys-apps/newrelic-sysmond/Manifest
@@ -1,4 +1,4 @@
 AUX newrelic-sysmond.rc 501 BLAKE2B 5b7cec04e02b2fbccc0bb9252f84b94785835d6fe5a0c67c629eec40cab124346904208d7799d048f13912f976fa49b9a6a1ac8403f6252507a34d147c6d4c04 SHA512 89096078085eb637b868c67618d5d07e3eb03c4eb2bcd9a48d07f23c72181e7988e3e28d817de30235392c07c0e46383e6695e4b696b3e3c8520b384d57457de
 DIST newrelic-sysmond-1.1.2.124-linux.tar.gz 2177939 BLAKE2B 9b66375e47ab651d68dc28d2a77424c05f97945513c95c1399f308f1b82b9759a0ba2d78bb47879d51fdd32c431afb45e6cdd89a280bef436eefcf9e89d74910 SHA512 beda4b9c3fc089a9cd836790a074f886a65980ee7b471d9e5fb54f56f369ef69172f00661962ae57482f2bffbc84bb27f9484dc01ca7b6a3b5d9a4ad7cf8c4b6
 EBUILD newrelic-sysmond-1.1.2.124-r1.ebuild 1276 BLAKE2B 6236fa49d10370fdda8a65bea6b856610f2e611853fd3ba48be84dd04b82c076fe311a61ee4effd03b0ee3f00a1a64f345308b8201a31d92847ba292656774a4 SHA512 ee13cfcf629f44d6ec6a8384b824f3969c1035f0d72f8df45b1ded1a9a14dfaa883d3e4daa54b0638abd5e3cd18586e3bf874304f4af26e3154c39cdb0d3b1fe
-MISC metadata.xml 229 BLAKE2B 16d4e14e343a46adc16e4d4c5ddd81116311b9ac1147b808d34e09faacadb23c58f0b3feab3fa87c11229a100f2ee8d605595ebd8995d86a2925c2a66dfbf18e SHA512 77ab994b01460b752cc315a7125c188bc44870f142ce6d1e07b8c598b8feb8747c3c7d83a55dbbc547d454436211e9b7db2dde7792438cb5c2b508c4856eb1b4
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/sys-apps/newrelic-sysmond/metadata.xml b/sys-apps/newrelic-sysmond/metadata.xml
index 2f51530a73b8..1b2becffa26c 100644
--- a/sys-apps/newrelic-sysmond/metadata.xml
+++ b/sys-apps/newrelic-sysmond/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>NewRelic System Monitor</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 647637d49278..b2204e2f8f9f 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,11 +1,9 @@
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
-DIST opal-utils-6.6.1.tar.gz 2121660 BLAKE2B 29ee388e75d86cba346d48834840bde22e6c38404b1dc3544fe7a2c64d584fed95aff8755bcadfba7f3753a764a120d31daa2d8f32e4a4298b65babc44a08193 SHA512 b460de30aa76b1c2bc66b636b995e32abc8554b3a7d8ac5b71401d7f07d999d5b4ca4328a6bbaa9c7c82c237b0e6be5557c9d13f4bbba5c7f625888aaf9cb65e
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
-DIST opal-utils-6.6.tar.gz 2119590 BLAKE2B 3c2b0b77fdaa22f075afe1d7205865b76e45e865c8799372ab61dbd272015ecb1343a32c185d6bd5fb323723a2c5aded1fead2ae0fb34ae6e97e17f5e15af6a6 SHA512 23ae61266253a5382f4d873492e89523cc26a32dfb43438e5becece88f5af4f0bc4ec756208603653f430b3382c42980a8c92dc0c1ba3e2b13831ade1eb14a27
+DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e
 EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
-EBUILD opal-utils-6.6.1.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
-EBUILD opal-utils-6.6.2.ebuild 2609 BLAKE2B 7cf2daad9b0665af219f5dbb965f54f9a87b2a1a7cc5a3c0a38bf9ea4376e945f0a2e6fcc56e55c960e66f2be428b0988dc2b9443bad692ff852036cd2e66201 SHA512 36e0b7ad0a114781c972f3826b838b155a7789060f265441d0029337c533e24ed68e06c0f9151766923d2f09f9a25243d5ac70172c1b0266d3dd9a311cb88455
-EBUILD opal-utils-6.6.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
+EBUILD opal-utils-6.6.2.ebuild 2607 BLAKE2B b33bc1f76c5401bcb2dfc8cc33daaeea923e54396a8a1cc0ae2b067a7e845b25d16390fc809ff65390d9f46d6f9fd6395adab6aa2c85767beab51d6eff4719ca SHA512 546ac0837649ff8e1e2498adb28ec393cebbf9038ef4bb7280cf74459379db6daf296d22c6d64ff55a8f589b910e280a4e821d487b8c52047e25528008a0e4c7
+EBUILD opal-utils-6.6.3.ebuild 2608 BLAKE2B 518cf78319f1f14f54d74251123c2350887078c1b38b7fad72fb946948c222f3c44b75327df8322f47703c3dd87a45f9ee7b6b1419ae7ea2c982b2fefdd78eed SHA512 0b6ec21cc3596910251160e33f2dedb7e6e5a9c8224c13fd09258279fa174707fc8d40b247d37804c89ccd6befd75637029a947eb0d75ea8a78b19c3586330eb
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/opal-utils-6.6.1.ebuild b/sys-apps/opal-utils/opal-utils-6.6.1.ebuild
deleted file mode 100644
index d447870f81eb..000000000000
--- a/sys-apps/opal-utils/opal-utils-6.6.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="OPAL firmware utilities"
-HOMEPAGE="https://github.com/open-power/skiboot"
-SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~ppc64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	')
-)"
-
-CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
-ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
-ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
-ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
-
-S="${WORKDIR}/skiboot-${PV}"
-
-python_check_deps() {
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
-src_configure() {
-	tc-export CC LD
-	export OPAL_PRD_VERSION="${PV}"
-	export GARD_VERSION="${PV}"
-	export PFLASH_VERSION="${PV}"
-	export XSCOM_VERSION="${PV}"
-	export FFSPART_VERSION="${PV}"
-}
-
-src_compile() {
-	emake V=1 -C external/opal-prd
-	emake V=1 -C external/gard
-	emake V=1 -C external/pflash
-	emake V=1 -C external/xscom-utils
-	emake V=1 -C external/ffspart
-
-	use doc && emake V=1 -C doc html
-}
-
-src_install() {
-	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	dosbin external/ffspart/ffspart
-
-	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
-	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
-
-	systemd_dounit external/opal-prd/opal-prd.service
-
-	if use doc; then
-		rm -r doc/_build/html/_sources || die
-		local HTML_DOCS=( doc/_build/html/. )
-	fi
-	einstalldocs
-}
-
-src_test() {
-	emake V=1 -C external/opal-prd test
-	emake V=1 -C external/gard check
-	# this test is fragile and fails because of unstable output
-	rm external/pflash/test/tests/01-info || die
-	emake V=1 -C external/pflash check
-	emake V=1 -C external/ffspart check
-}
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
index dc2a1f85fa2d..867857095da6 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="doc"
 
 DEPEND=""
@@ -89,7 +89,7 @@ src_install() {
 src_test() {
 	emake V=1 -C external/opal-prd test
 	emake V=1 -C external/gard check
-	# this test is fragile and fails because of filename path 
+	# this test is fragile and fails because of filename path
 	rm external/pflash/test/tests/01-info || die
 	emake V=1 -C external/pflash check
 	emake V=1 -C external/ffspart check
diff --git a/sys-apps/opal-utils/opal-utils-6.6.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
index d447870f81eb..6f824f28e385 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
@@ -89,7 +89,7 @@ src_install() {
 src_test() {
 	emake V=1 -C external/opal-prd test
 	emake V=1 -C external/gard check
-	# this test is fragile and fails because of unstable output
+	# this test is fragile and fails because of filename path
 	rm external/pflash/test/tests/01-info || die
 	emake V=1 -C external/pflash check
 	emake V=1 -C external/ffspart check
diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest
index 8af6d0eefebe..ea1aae9b4101 100644
--- a/sys-apps/paxctld/Manifest
+++ b/sys-apps/paxctld/Manifest
@@ -1,3 +1,5 @@
 DIST paxctld_1.2.3.orig.tar.gz 17174 BLAKE2B 6f288b039f719febf2f3370a0d245c07928f441754f0ac43bb3608d2718548d0ab90fbf9244d5b97bdfbc7c6bfab3d7359d435e99a2e19dd80661019ba0b654c SHA512 da3f5739aabbe0f276a194c71c20349b0571472aa6c114fe46ea4eb406fe1b419b167207b8d0b288776574c455f005386303b8ef92b0294e98532b269017ab54
+DIST paxctld_1.2.5.orig.tar.gz 18694 BLAKE2B 9d219846bbdfc5d709d9fb3758ec9451bef1545d6bb25263aef1c42f992f4201e2ce9f9cae0a77ed7584ec5c3c6dd0e3d0c58ec251a52f0b855c87b0fcf0e826 SHA512 c38b2cb0bf07d0075fa01f95d82adf6aae6e7bd010fa31b349af7c92b0498bf3225344500ef306bb633caec0b642771f453a8445cadbf342775931495d0ef2c2
 EBUILD paxctld-1.2.3.ebuild 732 BLAKE2B 82b12a6b32f17b7aa0110f7acf4349da0d8acf260a4bab7b2cc5ace30c449d960482fb63649f697df71626d13530e93b4cc10e50d50942cbb76b163d67e391a0 SHA512 e2a6674deb0720e2ceb67a8e52c72c93c33cc2eb7237f08fa682322b7b3f3a5282a0f020b45654376eab4bd042ff36eaab4be5204e9b60160236619f71836ca4
+EBUILD paxctld-1.2.5.ebuild 732 BLAKE2B b0c1a4bc809bf1e6c08b284addabfc974eb6bbbae0786b9cc5f018c66a7f727329f35eab6846f412b8968892144fb706f61283c8905304270c8205399e6cb391 SHA512 43d1065c3fe84e8427c8bbf29edc0f3367eaf8a60076299395d2b9f50736e4239a2f99c7c2aa7f5bb2224c191f648bac4b2acafc2e0fa8dc9aa20020f27ebef2
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctld/paxctld-1.2.5.ebuild b/sys-apps/paxctld/paxctld-1.2.5.ebuild
new file mode 100644
index 000000000000..c4650263e8b3
--- /dev/null
+++ b/sys-apps/paxctld/paxctld-1.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd
+
+DESCRIPTION="PaX flags maintenance daemon"
+HOMEPAGE="https://www.grsecurity.net/"
+SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	# Respect Gentoo flags and don't strip
+	sed -i \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/d' \
+		-e '/^LDFLAGS/d' \
+		-e '/STRIP/d' \
+		Makefile
+
+	eapply_user
+}
+
+src_install() {
+	default
+
+	systemd_dounit "${S}"/rpm/${PN}.service
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index a3320ff2c4a1..3d9864995d47 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcore-0.10.12.tar.gz 646922 BLAKE2B f3251b1a0d773e83d60f15598c2c5679a48a1e1dd81b82956ffb26ef72c25296903d64deeb0e91d95ae26832d0e08e3cdfcb68b95bbcd87acf8ed448a4f4ae56 SHA512 f6f900fc7f77a683c398c874c51eddb387f9aed572d5fce38f4856faa71f4f8e870b1bc276a87f15967733fa6ec7c8345f2d6b777897694537fa1e9165b1433c
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-EBUILD pkgcore-0.10.12.ebuild 1087 BLAKE2B 26681f82be0b812d29256283224c2724e75c87f7276065925751ea2bec9214b8c8e6d2051a56c5bd902a786296547d3c64541ea263ba542f4ed5c2700cf71e6c SHA512 c539820725887d1e07656d226f0362b1bc00a050ea9e78e498ad64f2d891ac22c52896d0ce9f66073d75b15f90851e2053b32c50f0911b8573d86ae7cc651978
-EBUILD pkgcore-0.10.13.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
+EBUILD pkgcore-0.10.12.ebuild 1083 BLAKE2B 1df43065262419decd1770d5c746211bedbe3120f505cd6c21077d5a3c9ee9491561b91898deb878cfd0c69ff3fb1678d6bf658904a56abe1a3683201b8c461a SHA512 0ab3b254e4ecfec7eb20280ab69b1dd8b49c2e7bb1de79697dc08c9c1717ccf1b32091c42244c4009dc06cdbe845d82f988a2201980f90c9a634a5c1fe1a1ab7
+EBUILD pkgcore-0.10.13.ebuild 1088 BLAKE2B 058f81bf1ce501c7a2938077dd2a195143e92646a9da5fa02ea87826ce72e6c4ca4514b06e409dfa275e824b1877d1f8a9c069993cf533dde67a2f0c282e27c6 SHA512 4bb3bec4a2e6e8c22218467b283ffbf7b914092dbe09afd5051268e97258635a50c0bdb8780ebf548c482d8fa3043f0e8791fd3f3b67e1222f5123d743955026
 EBUILD pkgcore-9999.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
index f9dfb8c228af..185be89d3ad1 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
index 4d3887960e30..688fe95a75e6 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 76c1fe07edeb..7d25ad91e5e5 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,12 @@
 AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3aeefafeda3a70e011856313beb4ac28e37312e7a53219b0a2d224a4be650200b537a39a58858c443e2b3253c1ebab617aaa6acf95b7e68fc SHA512 41c37a0711011ebdaafee01b357438ac3219b34b6c9e6ebe182c863d61c899e4819ae71bd9adf4b52bee37750c99b5b1cd40c6a92f119899bd227251d37ccd99
+AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
 DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B 6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462 SHA512 d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
+DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
+DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-2.9.ebuild 4875 BLAKE2B 2b97a2f7563e4e3474898b77ea0bac1c301ce1f6cddb3841e863e9f9fca6ed566221b012c53099e7b035c0d705a8f1fe67cbee88201c30aff7bc6f126aaa6899 SHA512 d967b6d20255f0983cbebead02302e14b4a7f8dfab70a079d82d38a3d8255b673ba56583a211d3cc60c2674d8d6a9c275d34a9572b1f6595e14fd0de19ad75a5
 EBUILD policycoreutils-3.0.ebuild 4753 BLAKE2B 3238ceb29eec9166041462b3dd6ea8d91c54d130733033fa5d4a7f1e53a903645f25399d359e31ef1b4e713e5fa68b5ddf07f83cf57a4de7a32d122958891d7d SHA512 60a11fe6afae58bcaecc640671bd3adc55bcb100b463c0931e91d387236320692b8b878a685e413f9728308f5de903aec44a6548db6283740854461e5d700a67
-EBUILD policycoreutils-9999.ebuild 4755 BLAKE2B 872ad4311452b99400e6c9553610e7b1d482ed9489dcddf2fe0d31522eadb75dcce75a46c59d9099b0b7171f7cd698d69d414f591ec4786d5b8ee4f6e202ea24 SHA512 54800d0cf4ac8fb58d669383117f000ec64e06f477ed9323d90f3fa5808d46f7da33e390fbf5c70a487599d2464a33349b356071a0321c84851cc5327cabe5b8
+EBUILD policycoreutils-3.1.ebuild 4755 BLAKE2B 249fe33cbfe8c76107a84503c6b56853fa2e5f3f48224abf30d4b4363b178d01963cf4308cad05ee28d741de56bb97ff2995b56f9e379fb521db7e02aa45be53 SHA512 74d1dcff0f59dad3f692b380e4ef98b3396cf7e12482a1465b4ccf9df24cf7c5da51b52d16c0d7e6c4a29e4948ac4acc24a5d08fd132ef30dd9f1d21989c3428
+EBUILD policycoreutils-9999.ebuild 4755 BLAKE2B 249fe33cbfe8c76107a84503c6b56853fa2e5f3f48224abf30d4b4363b178d01963cf4308cad05ee28d741de56bb97ff2995b56f9e379fb521db7e02aa45be53 SHA512 74d1dcff0f59dad3f692b380e4ef98b3396cf7e12482a1465b4ccf9df24cf7c5da51b52d16c0d7e6c4a29e4948ac4acc24a5d08fd132ef30dd9f1d21989c3428
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
new file mode 100644
index 000000000000..360a49049780
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
@@ -0,0 +1,11 @@
+--- a/newrole/Makefile
++++ b/newrole/Makefile
+@@ -50,7 +50,7 @@ ifeq ($(NAMESPACE_PRIV),y)
+ 	IS_SUID=y
+ endif
+ ifeq ($(IS_SUID),y)
+-	MODE := 4555
++	MODE := 0555
+ 	override LDLIBS += -lcap-ng
+ else
+ 	MODE := 0555
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
new file mode 100644
index 000000000000..569dc07cfcf9
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20200710"
+EXTRAS_VER="1.37"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
+
+IUSE="audit dbus pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${MY_P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libcap-1.10-r10:=
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
+	sys-libs/libcap-ng:=
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	dev-python/ipy[${PYTHON_USEDEP}]
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib:=
+	)
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
+		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index d083c5232207..569dc07cfcf9 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
@@ -9,8 +9,8 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20191204"
-EXTRAS_VER="1.36"
+MY_RELEASEDATE="20200710"
+EXTRAS_VER="1.37"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
@@ -79,7 +79,7 @@ src_prepare() {
 	cd "${S}" || die "Failed to switch to ${S}"
 	if [[ ${PV} != 9999 ]] ; then
 		# If needed for live ebuilds please use /etc/portage/patches
-		eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
 	fi
 
 	# rlpkg is more useful than fixfiles
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5c892c0cb504..e8605bfa7aef 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,10 +4,13 @@ DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
-DIST portage-3.0.5.tar.bz2 1043083 BLAKE2B f95fea950c15a9ddc7b1e87820a6d300c54d0b027c36a6522293496cbe39b40a7e4e472faf9f65c96c4f83f34a27830c4795d433860ed9f87d042f9b18a59878 SHA512 59f06514c16f215647ab7c3f4eec40bacb8e17bba46b2d59b94be938891c2e48d157d240fb47ae736968bbd754ea56343b0138d4ccba58458913b95a798f0c66
-EBUILD portage-2.3.103-r1.ebuild 8273 BLAKE2B 34b93c759e7ac7894ed9881245e682962d6254c0a61189962e5f38edcd110275312804e2ec98113635afb66ba5f00d80a12181f440b253981cb1a2db618511ee SHA512 f3607091262144d8376f63328822fff78feb908a0afc3dd84293672fe2e86ed9b2ca415ef7740a616a6b2fb376e34dc22559c1ca8c2771ab0d2ad0cdf237b6a8
-EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
-EBUILD portage-3.0.4-r1.ebuild 8447 BLAKE2B ee885e9665ca4bb9336b11d039656a7091d549b98d9ee2078dd82a5890abaab61d1e1cccdb409ca7bfe53ef1eec36d93c7c5fd88b53fcccd9f1dd1599892c7da SHA512 0f81f75a8eb1f6e3e2fe6f253cbfbffb133f2000282c46a15542e328060531b6cc1a0e496cc67378c52c6d2f65b63f8c79a1fbd260adc81b4b27219a84fe1d03
-EBUILD portage-3.0.5.ebuild 8307 BLAKE2B 429f4c4b0d4478edb14c7fd83c242559891e915b2c6528ba480d59564aaa6dce4fc1e261475ce4822948530887694e67de0d0bf970bce4ae7b341de7938d2d94 SHA512 aeef65f9082586db16e37ef969650d007faee8ea83afbe76796ffef7427b46ab2fd17e4485132b5e77358ad19f3d48fb4dc13f7fbf54c1b1abb1cca76ee3ecde
-EBUILD portage-9999.ebuild 7424 BLAKE2B e30a2c85a5c17151fa9fbb35a7b32d24718e68f6dbba06b6efec623ce88f4df2ede6cc9cc5119ecb8197692853e0564803e4b60b7f413bfa73102bffcc7ac83f SHA512 fa5b9addd1aa287e5aa42cd1d335400ab780a37b02ed9c4473571e7a3a63d8dc79c25ff73a84573cea1dac4558084cb515207287d08446c8ca0c1721f2656411
+DIST portage-3.0.6-selinux-utf8-bug-741194.patch 2721 BLAKE2B 6f743fd32f72e18a029827ecbaf168d67cf5056a60ba89d00dd1ff7225f4a4ffa63dbb14310cf590553d47d4ac52d0899c5b48ebb799bed6dd76fc74a762e134 SHA512 108dd63d029bf296a26723e35f8c05ae9c5c81fd1b1f5398bbc310dd832b1af452865893e0c434b857cca12bd458dc1963dab689fab629ab7d48678472d9bc47
+DIST portage-3.0.6.tar.bz2 1045033 BLAKE2B 3c31252215069619bde15191fade18198e777f892e910ec6f5a9ebbc8569a56d219943ccbaf18517eae51f74d8c53047d4e0ef5675166b09e28766f940ad7391 SHA512 0ec6ca0470060d6a441fa48728f542afc97e49f93c8f2bd66ab51dda946f65a4bcc52e1f7b2afe19c040b4dcf05d4a2d8578cea2ab3526c7b8fa630670e8a98a
+DIST portage-3.0.7.tar.bz2 1045185 BLAKE2B 1fe5e13bbbfaecd1b850b29b17908fb2c2756d559b0583174833672b68a67cfc7e7080334729ee5295b646423ca3925284f42eeace0c0b79d02305a170aed5d9 SHA512 701f6bddb9255d5ac86ed6e73f869124925bafd09f7c2e458376b54aebf030fa7f0d80beda1626350755cc1e8a2b9c2636b3fde1105787f2d2a0f742a73cf5e8
+EBUILD portage-2.3.103-r1.ebuild 8291 BLAKE2B ac5cddcf0746e69bff1806884daf9222a42a58e2d8054eff5dea4920d836367a94164b8651812143ebce0287d38e05e7d4234fde7f246728d3f122e776258da8 SHA512 320f7430df2d4b787de635a5bebeafc17fb5e3b1ddf7a33077def1cb3cb3ff381a8b3b70c48605adc124bfd146a22b31bc8232500befafb94ad8184aa39f8dfb
+EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
+EBUILD portage-3.0.4-r1.ebuild 8528 BLAKE2B ede668363df0532550ed3dd81e20ea05d6f54a03a1a311e615d0551f38ea2f2be1f102b0b61a0e86285a420b056cad65e34aae2379280366bc6dc78e7cd8342c SHA512 f93f66512091d7005c2ed29db7837b6e6100bfcb8b08e878ff7e93e3411c18ddaebcad2938bf15a44d9b6919e8a1af5b3a5fff5cadbc5e8659759f5763ac4094
+EBUILD portage-3.0.6-r1.ebuild 8570 BLAKE2B b9fdec35e39640500f572f75c9408ea7444b1a5d7185eb549d535625fea57e3db7168265da5ec06019d85e13e74d373712253a723137764809a81e8db3cf0cf4 SHA512 31c2f663fe0294e5915b8ce628db69f965546fd1f4d45f6dd6491b39ae9915d01939445cc1cea33377afa281683f1e011e85a843f1c0f7b9bdf34518baaf9a64
+EBUILD portage-3.0.7.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
+EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.103-r1.ebuild b/sys-apps/portage/portage-2.3.103-r1.ebuild
index f35ebfa2822c..ecac7ed55c3c 100644
--- a/sys-apps/portage/portage-2.3.103-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.103-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -35,6 +35,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
@@ -213,7 +214,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
diff --git a/sys-apps/portage/portage-2.3.99-r2.ebuild b/sys-apps/portage/portage-2.3.99-r2.ebuild
index 38f185f95eb5..9f289c0f83fa 100644
--- a/sys-apps/portage/portage-2.3.99-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 epatch linux-info systemd prefix
+inherit distutils-r1 epatch linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -34,6 +34,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 RDEPEND="
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
@@ -218,7 +219,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
diff --git a/sys-apps/portage/portage-3.0.4-r1.ebuild b/sys-apps/portage/portage-3.0.4-r1.ebuild
index 2cb5d1ea7a9b..55c691b6004f 100644
--- a/sys-apps/portage/portage-3.0.4-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.4-r1.ebuild
@@ -7,16 +7,18 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -35,6 +37,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
@@ -217,7 +220,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
diff --git a/sys-apps/portage/portage-3.0.6-r1.ebuild b/sys-apps/portage/portage-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..5b2ae95fe1e6
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.6-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info tmpfiles 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 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+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 whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+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)
+	https://github.com/gentoo/portage/commit/a8f0e05d35b0ba2747827ce03dff42682192def8.patch -> ${P}-selinux-utf8-bug-741194.patch"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	eapply "${DISTDIR}/${P}-selinux-utf8-bug-741194.patch"
+
+	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
+
+	dotmpfiles "${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
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	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/portage/portage-3.0.5.ebuild b/sys-apps/portage/portage-3.0.7.ebuild
index 5578b8a560fb..28cd3d04cca0 100644
--- a/sys-apps/portage/portage-3.0.5.ebuild
+++ b/sys-apps/portage/portage-3.0.7.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -15,8 +15,10 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -35,12 +37,13 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -214,7 +217,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 18b40afe2889..3a8919c0bbf7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 linux-info systemd prefix
+inherit distutils-r1 git-r3 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -15,8 +15,10 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -29,18 +31,17 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
 RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -207,7 +208,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# they must be installed to /usr/bin.
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index cd9ed6a01f17..5e8dffdf74e6 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,9 @@
 AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a
 DIST restorecond-2.9.tar.gz 18893 BLAKE2B fcdae1a4ec489f3f581212cdd3c13c5561feac3ee758f354dca75c97938c62b9ed04aedbd4b3b5cde09a5887247389262718145620d0b9749e364d1614f57241 SHA512 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a
 DIST restorecond-3.0.tar.gz 18797 BLAKE2B 354477ea9f57cc27c14a2648b99b32c45ac6d4e32caeb0fb108ed8f40a2e2e04101e2658d0107a1f2741717c242ad80b2e14db03488ab62b88eeb8b1a9ac0dd4 SHA512 f75088f72a17f1f7550ef67052202cea1fd9cf1bb1eec0355f4a0641ba25097b289f629df328ee79aec00f8361cbc6df10efc4a5af2f0b67f9922ceaf92aa956
+DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 EBUILD restorecond-2.9.ebuild 1145 BLAKE2B af99619a522615ebd01935b687f24c45d512510522bd725eb66b430c6b7d46086cc33634db109dc9f08f165f82e8bf059d34cdd4414ab9873298a52020d9730a SHA512 d6de5a092b1241d43e2b4663441e93568fa463444d41b032245e157c7994d072e318ac217a8e252549994bb72acdbdfb36453d51966707c18dd628fa5b7d4126
 EBUILD restorecond-3.0.ebuild 1145 BLAKE2B 2c533c3af22c23562873d976e5961ae897bce49080283002120454042ffa4cff29303cfc34b92e1b016f0ddca500f8901c668b10f8a6a9729b27e4d523c3444e SHA512 9a55df70a4e7482a456a298b56f9d4560b62863a09da9ecbd9f8cdcc3d967ac59d0ccc09b82cdf2af2e64d26dfbeac4162d4ed5d6cb6bee66819ec6ab863c532
-EBUILD restorecond-9999.ebuild 1147 BLAKE2B bc1d5af33c8feab8e444dfa10e8403dd68eafc7fa82869f904ea19a00341a192afacb560ec527530405ebfdc6715998d4540fad80d6faf8a30a36ff91a4db415 SHA512 06f29b5a6d9b23e2d09b5881310fdf627799b35d65644c91616d45f89baeec02412a47964cf0ce07d1da2d4887211ea2c55401eaab777394b69c015c3ba10b0b
-MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
+EBUILD restorecond-3.1.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
+EBUILD restorecond-9999.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
+MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/files/restorecond.init b/sys-apps/restorecond/files/restorecond.init
index 709f1d1b9ece..709f1d1b9ece 100755..100644
--- a/sys-apps/restorecond/files/restorecond.init
+++ b/sys-apps/restorecond/files/restorecond.init
diff --git a/sys-apps/restorecond/metadata.xml b/sys-apps/restorecond/metadata.xml
index bad7d3fa425c..9a9681c39bd3 100644
--- a/sys-apps/restorecond/metadata.xml
+++ b/sys-apps/restorecond/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>
-		daemon that watches for file creation and then sets the default SELinux file context
-	</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
diff --git a/sys-apps/restorecond/restorecond-3.1.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild
new file mode 100644
index 000000000000..001d8cd6d3f8
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+MY_RELEASEDATE="20200710"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index efe40fb0d733..001d8cd6d3f8 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs
 
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -32,8 +32,7 @@ DEPEND=">=sys-libs/libsepol-${PV}:=
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -47,7 +46,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		emake DESTDIR="${D}" install
 
 	rm -rf "${D}/etc/rc.d" || die
 
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 9af24eb30b2b..cc90880c9533 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -2,4 +2,4 @@ DIST s390-tools-2.12.0.tar.gz 1186816 BLAKE2B bdf7975d236ec939539221ba548d675828
 DIST s390-tools-2.9.0.tar.gz 1162090 BLAKE2B a86b8b1859d125f476a96546163881723cf87536a654871269c23ec6e72266776083f5d49bff3c65c2a01af7de985d2079cc9504a605e3d42de297a464b8ee69 SHA512 23315e8914a5c797b0678298ff51fd95a3c9f065b0fa9f6cf954573fd5ad394890d7f8dbd9cf2501d845c76c3fe31952b25cb7c2b2d59744305b2f37cf3a65bb
 EBUILD s390-tools-2.12.0.ebuild 1559 BLAKE2B 1f0ef83fd6c614989354de59667d2a67647e4cb9636251c8215ace86d483326af6e9729378bf8a387531899f711ee17404553183a654af1260d616d0b9ae686f SHA512 06123db6df9af4aa99877232ad1aef677da64582ded476d777a596c123a82dc9a9d4505dc19a49fd5170e549b40bdbd7c3536ca257cd36ca99a51025e10e98ec
 EBUILD s390-tools-2.9.0.ebuild 1557 BLAKE2B 3e3c95cf3a5ecfdd23c20a3582b1d80a9efc57c4c6e91ba5a634723b8f304eb473c21fc9d925f7337f9e18f0363905ca61864a65c766b2cbad6f211441b9fcb0 SHA512 0873ae6bbaf6fee6e9882f673522b8445a6461364ee69b20bffcfe2e461849504f5ceae810f21a212399b4266ab30454bc4f46dae32f5ca321eb93fa5132c3de
-MISC metadata.xml 895 BLAKE2B 429f3346ebc851959fa05df5ce86f0b3d52a6a4021a0158963a270a173388272ef17429b823b16e6e873f45a303a7a6f0cfe840c00c325aafeda6002daad8eb4 SHA512 2a8f3b5c2c9de17868fb2de6c8505e8c80c51b8b8b63de7f1fb3f07b774d8e0367a36c6a68a14fe3a5b78d2b1c43794bf75f98c63c98772ac42e8cd73d9bc5d3
+MISC metadata.xml 731 BLAKE2B 394fcebd142b7302d84787d4c56e927b1619f5959e77d3f3daafbd6cc13d25698cc16703f21eada5a7d644f913d89fddfa679987a8a4531022706a2f97911e0e SHA512 e41893227ebb14df77594fb0f7f262fcbf7cc84513a80d21be5d201d8e0d78edb4b24317878770b6a3895a1b34d8cf38cbb566e030d59a5791ee867139bec473
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 8d883bc8f829..e13e500a76b2 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -1,13 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>s390@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-A set of user space utilities that should be used together with the
-zSeries (s390) Linux kernel and device drivers
-	</longdescription>
 	<use>
 		<flag name="cryptsetup">build the zkey-cryptsetup utility (requires USE=openssl)</flag>
 		<flag name="fuse">build cmsfs-fuse to read files stored on a z/VM CMS disk</flag>
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index b6bb1481d5de..0e37b3a79ce9 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -2,4 +2,4 @@ DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a
 DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813
 EBUILD sdparm-1.10.ebuild 1009 BLAKE2B f7e351301f894a718fb12f1dff540760ca4f23236de6adc846dfadeefe3cd792b3bd105fe7bf3ca2b191704d3343d65764046cfb48a1405ddfac8ae332a818e1 SHA512 c1567b91c66294d1efe62d5eb7730de9e9e806508bfa750125d3955a651df66e0f8200f1f1b1a0cb8aba0f13868999005ce4a61e5002a1f493265fa0e385eb0b
 EBUILD sdparm-1.11.ebuild 1016 BLAKE2B d612e67d7de185fa06ef544ea7a89bb388a7a0413a4a62c1ffd031f9f32de8995ea2c4ef6002a9e5e0ecda03c4ffada92100f16a90d70d061da423e5ab585cf9 SHA512 0ff795ab9b9a9b127d81ea0b14dc56d243c18967b82df622e936b395ef0a10d75e5bfc141d4f3036848be059a607092638caf070193f12ad9a043ea44e50b0db
-MISC metadata.xml 372 BLAKE2B b025115c048016a23d179218c7e3579cdf87fa3e6445b5d69029df1d96a5f3df951bf087f0c51f65ee1a5df7050163ec99c554428cf883247e1f9ff5b8812d1a SHA512 ac15ece82367c7a5a7cee2248a418b2dc5912027f29805d2851643127ea90c7b4ff3d21c90afcf0255f6946b0290551884405bab7fe62d2d9ab0dcc10de4da5d
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
index f67ae1a49196..56c124413057 100644
--- a/sys-apps/sdparm/metadata.xml
+++ b/sys-apps/sdparm/metadata.xml
@@ -5,7 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<longdescription lang="en">
-	Utility to output and modify parameters on a SCSI device, like hdparm.
-</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index eaec711d0756..084ae7ae46bf 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,8 @@
 DIST secilc-2.9.tar.gz 175885 BLAKE2B 0a5fd0adb70ce80574148ac035dcb8c5c80f6779a6a0c696eaba26cb6c4441e58eb161600034102dcb34c87099357bfc66015d245cf2fd49b56e65d782fc8aac SHA512 c552ce65fc23bef1a93b3dc485369d64ad19a3f30707b95d0dd488d1766ab9f5e75884b79e6464997eaafee119193a1fdd5ff8228aee0fa902e426eefa14a4ee
 DIST secilc-3.0.tar.gz 176060 BLAKE2B dcceaa72f3e34777f0d4a6a05de073e4f2dc53b7577c2a52d5b5ab5e10d394ad85817985e683c9af241cf6bdc9a549d52142477281000e19ff66063f440b4b3a SHA512 e82d973c99b95a7f34060ce10a7f39802c3d6d428a52992efd8551da7bceafbdf9f81262d9aa2ad9d22a0704959de525c5a2de21fd96651277fab433ef340225
+DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 EBUILD secilc-2.9.ebuild 902 BLAKE2B d21e16c113f24dcde2db43a79ea5c6618f55e5ee24e8bfba4006b44b092760ad9b3240d72b8847e1dbe2a3cad581a9a0d08540c9bac70528ac7cfad14f6b7578 SHA512 77304add0be53344872bbd68e91da6e1d5747b58d1b5af4ce47a42377f82e02bcc3df46477dbb169a1bd053a2f0a5548a30dc46bb74fbd6e636caec970eb6363
 EBUILD secilc-3.0.ebuild 902 BLAKE2B edd6c9642e5cb1457c58fed5e391ee9163c31b223217f8b775411d7f7459ba10278ee726612f24a6baad884642970baa441c39bc4b47075543822717a1bc1cee SHA512 b5ab249d7279d50bf97e26004f6f0bf5e57df6ccd24b5261fc99ff20b2fcb9d4df8cc241aeb11d759a346b05c50fe39c03233fc109c6a2367ba244b77957322e
-EBUILD secilc-9999.ebuild 904 BLAKE2B 6ea3358375744f292c9da27734a7fe8ee9bcc0f18891e935f6115a38c6bbbdbbb1c17cfad70a9abbac5b5ae96525f80a4ca1db661db19ed44a30d94db5aaf268 SHA512 2f1a785c16007f1fe3fa843b697a6652af0830c84d32be69cc101ac049f59443dd1967ac06be850c574c5ee737b20930a69d2bd05c31903129dcc29d4855b8a2
+EBUILD secilc-3.1.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
+EBUILD secilc-9999.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild
new file mode 100644
index 000000000000..db36c3ca9f49
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20200710"
+
+SEPOL_VER="${PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-text/xmlto
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+RDEPEND="
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index d920dbb0436b..db36c3ca9f49 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index e7e6c7fd3544..70f2343a1565 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,8 @@
 DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
 DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067ddaf71394a0a143a096d5708c5e7caa468b12826965c02af0b994f35d26c573187bf67c8d1ce75f5e8a31a1fb0fc6562 SHA512 743df60a643477465e4355880c56813ea8539415ea7c9631fb9b7cd7969a37cce572a6a94b785065d92baf9d7b6c753daa5d2f9709df7c9203c7effba46d58f2
+DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 EBUILD selinux-python-2.9.ebuild 2552 BLAKE2B c3a46c9b484dd134426ee1cfecdcd0caedefa0d02cb1071789ca62c7a2ad860c12f770bd8130ed25f660b70e352ca2c65b062ee6bf9ac2b185e651ccfd44e861 SHA512 2d896bb07f08d2def9eceebfaf0aad8fa27e3041ca44e04c3e936502d9323b48a0d8c89c5611ea9885c90d90a9c0823f3c8786bec5520857b20ad4f18461fe61
 EBUILD selinux-python-3.0.ebuild 2558 BLAKE2B c390f92149cd44b5443867439f64d0e71b75c9614e7d3115008b57b04d0307dfc36fa4c4a43ca725a9b5a723c12091c9496257dc0f4c31908a52c922a943c348 SHA512 5c4533c9bf0545c13881c7b2f4281c4e3e14498f4e5def1285843b0464d232e6f6bdaaf49cbd9b3ffd3b72e07f03659d56405e2431b5f195dd27f592c42aff61
-EBUILD selinux-python-9999.ebuild 2560 BLAKE2B bbf5adc0ed2aee052b003637a072182881c17b4562103af1638b2a28b67060e6a21e8c488460d7d971788cf4179b4725a1282641328b5a468a1d404b1839c655 SHA512 783a681a82848bc966b93ce127c39d06cd62692073282a43d633dedd95a448837f109274574b73ef2b5baa1559b60ecef4d89edb7014640622c9002f2f3e7a16
+EBUILD selinux-python-3.1.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461
+EBUILD selinux-python-9999.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1.ebuild b/sys-apps/selinux-python/selinux-python-3.1.ebuild
new file mode 100644
index 000000000000..d890afd5e440
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20200710"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+SEMNG_VER="${PV}"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipy[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 011db20a0085..d890afd5e440 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -38,7 +38,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
 	>=sys-libs/libsepol-${SEPOL_VER}:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
 	dev-python/ipy[${PYTHON_USEDEP}]
-	!dev-python/sepolgen
 	${PYTHON_DEPS}"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 3af184363e3f..0fd63ec0ea35 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,8 @@
 DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
 DIST semodule-utils-3.0.tar.gz 14263 BLAKE2B 119f40b34184e2cb0719e6a34ffb026f23c172f74d8ca3812220785381fabc5c3761865ec3b211f03f5c96b9ae0081341a661c2be78198171b09c99b37bb0716 SHA512 004e8f02f7e7e6f016b2b5a1a7720a87409d77d0040f7df830cf73808c9f8e3d87b41a7cea273420909971ce8bcc6540d5a46bd25be8c032b12257b4861e1769
+DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
 EBUILD semodule-utils-3.0.ebuild 977 BLAKE2B d36ef3f0bdd532b05eb8c204ff1cd8c11174b85bd0469aec8f420e9874f35b6b7bdeb482c2021f6e15bd7ad826c6483c991e7d0ac6eace075eab8f57be0281c0 SHA512 35159c6ba4ead2c0909f86cc45f8995928565dd1e36b6bc513cf73d273188c6e93689724104991c9a46c6cfebea6bee33c5776057b8ad08016297c72906f4601
-EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 4d791f07229bcbd588085aabb6217a817542805a4e1a9dcf3481202cddd7fa165c8bd6572c685ff96626320af65463452fcc19e14beec7b1d64634578b4a90e6 SHA512 8ba50ac799bd408a9bc0d4e896a14bcb90aee3469695dfb108b70607e885c6a2c488b9c700f7b9d8e3866149721f61f6b8505d7a3fe913f664ac8dfcab1e8f24
-MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
+EBUILD semodule-utils-3.1.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+EBUILD semodule-utils-9999.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/metadata.xml b/sys-apps/semodule-utils/metadata.xml
index 35a209da7acf..855cbdbdb7fa 100644
--- a/sys-apps/semodule-utils/metadata.xml
+++ b/sys-apps/semodule-utils/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>
-		semodule-utils are utilities to create and link SELinux policy module packages.
-	</longdescription>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
diff --git a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
new file mode 100644
index 000000000000..db1d166cceb3
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20200710"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index dfe7c8bdc466..db1d166cceb3 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
@@ -30,8 +30,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
 
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -44,6 +43,5 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		install
+	emake DESTDIR="${D}" install
 }
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 32046a10c186..9833c0f65e82 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -4,6 +4,6 @@ AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a
 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 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718
-EBUILD smartmontools-7.1.ebuild 4045 BLAKE2B c4b6a4d20e1421d7579a71de2a325bccded34e330b2315166c993379de1e8c565649cb190e20ebb32d1d77ab451f9035400584e1ca1d9810fdd146178f441d6d SHA512 305f483387efd22bafd3495f4c8dac34ee43767eeaa76a37dd3cb5a7940cfb0f1e081f25246d1f5169e72e1e4331e7de43f0847af1da266113eac07cbe6f612e
+EBUILD smartmontools-7.1.ebuild 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718
 EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild
index 9112d252fcd3..bca8212f62bd 100644
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index 0702a2bccbcf..f607f1552b8d 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -2,5 +2,5 @@ AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0b
 AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
 DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
-EBUILD tas-1.6.0.200601.ebuild 1732 BLAKE2B c4fae8c96d0592cfea9a17aab541f3d8bb342b838e32e623d55ffafaa83520b1676ef27f2bbbd190663cf4ab184cba2d526b890b4f369b6fa99d7158f8dd2e5b SHA512 895167e4030520bc44e37587821e850d893ff3718087a5a8bdbd3fd1adcc32558dc83913941a4eba16e08035bab4fc971b2e07245eca24d14e58b7cf8af499b7
+EBUILD tas-1.6.0.200601.ebuild 1736 BLAKE2B 23465f2a38b3cb4922e94255416a43ca0a44ac5a4e053723f8242314635a3ed9a34a9a3e3d77678704ed6830a85078c79cb91fc12adb61fd91829e7b16dd86b7 SHA512 38c05b38236c5efc4118ac8949001f0e1eaba88ee334e3d97a569fd1860b95b430b6aed0e789b2eb3ec2c6907edd3e9e1d5a2d2ccf5537953c3ebfeb05768322
 MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed
diff --git a/sys-apps/tas/tas-1.6.0.200601.ebuild b/sys-apps/tas/tas-1.6.0.200601.ebuild
index f6d0fe8f8aa7..a2146bbbec85 100644
--- a/sys-apps/tas/tas-1.6.0.200601.ebuild
+++ b/sys-apps/tas/tas-1.6.0.200601.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils linux-info systemd
+inherit linux-info optfeature systemd
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN^^}"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 2d6d9211e716..8f1e2a6a0706 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,7 +12,7 @@ DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec2
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8895 BLAKE2B b22b69d7c3ca75bff788a94c5e9c7c7122249a0f11906d26af5cc892333d2d24dbab458f208ec30bcb013115e204a64bff00d73f1dc2179c7b3a483b6c48a865 SHA512 4a39d8705ee55be0dc59582cc52e2b8f9095c0f130d069e9cd1bb74fbd51cbfcadebe370538b308fb769e3cdd378fc92bb8fa8ddc52e12a8627542bb57ab13da
+EBUILD util-linux-2.35.2.ebuild 8893 BLAKE2B 7e815f2d65257a1165a5a4f9e60c3338754a5300e800bae1872786e7e4c8be549668565dcb861856f4cce63e20e5f103120d77f0cf7498723f271a95f7ce9d78 SHA512 d0a4c98fb3049508a6a5a8ed0fbe5e1dd73cab5a343cb7d6f4d9a959232618868647c149766b8cd5c73e8ffd7fa4b5a56fb2359e34bd578f51fae60b81cd4415
 EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index ccb654848970..a8a3a209c72a 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /sys-apps
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)