gentoo resync : 05.12.2021

23 files changed, 378 insertions, 604 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 34fcf3e329b1..5f5d82d2178d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index f32a50da3d5c..f8a9b88406d8 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -7,7 +7,9 @@ AUX at-3.1.8-more-deny.patch 175 BLAKE2B 622b50e7c03d738602a95e0465bd3dd4c1152e0
 AUX at.pamd-3.1.13-r1 208 BLAKE2B 725552bae7c0a3d5d10b5bf66ee5460a33b415f8316b798c650297ade2bd98a14fdf9533c0129dbfcabc76d35652d9b5ef5789fd7fd7ac42d43f8e480569c176 SHA512 7ebbeed1fb9c9d8c26f677956ae3fb5d947aa8e1f1dbc2c576b1ee4b2d8c92d206ad361d61772e6a28b40e747ad009d16ed1d3516fa2549b1f01f6f0886612b8
 AUX atd.confd 214 BLAKE2B 73cb9a8efa568f11620029521e93b7a2e424eeb860d462663ea4eabbe236b386c54392824b224e3de1d245ef40fef503477502531b1d95c40def08710f788772 SHA512 12f1423e2d0841a98ce506ebbf24280bc634b76a2b15cb1c6e12285fc7fd859428380841754ab2e3a0b7c3d7cc9957b53d4e018651ef097ca1af83f92cfa130a
 AUX atd.rc8 289 BLAKE2B f1ef6e087b1eee30b272a88feeb7f45ec1e4bc78f3c016b48c0ff353e6171a6e73eb3b3e043e5b8500864bab07aa419928a8e0c132bb56f18975b800d51534dc SHA512 a8517b4a754ad096aa72d975b556925c566963657402ffe0c00ed3fbc22a84f6c32917c8d2021e6244339d171352e429d1c360ad6c500de6c60a444e07d006f3
+AUX atd.rc9 265 BLAKE2B 0f1f1e75fbcedb2fb5baf2ee6dbd8b9d519cdee203bb91119f78678dea2f6af569197c920ec0a39548cbff546abb89c46de5127a0cbc55b6072028cb25ea9a24 SHA512 de3525120a16884f72cedacf8873e82e2a4010e8bf9fe3dca3611d9a5fb081232f0e75f91886a2f31c89645b7f97fd419b60295f00b16f561325c0645b5ff57f
 AUX atd.service 172 BLAKE2B 84ff9c4a55ba895e87303f31f124562fa22eff29059c07d2ab3cc81ecdfd742776c389baa80f8ddc25c01220801465218e62f4dd73e77435eb05023c4cc5aa87 SHA512 6ac20de3e0d03f3fd99b302b8de6f8dc5228d0cca3b383d9f6b1f1abe82d8d5f4d7a23a4cae6d710eabd21fc28c568a63c0c802eb6237ca91fa48318b99a6f39
 DIST at_3.2.2.orig.tar.gz 127677 BLAKE2B f4b0e1cd09d1e679d0bcc287462300827d12663927dce1534a74bd4ecd670f903a81cd6147c03b0e55192655c2a99250c27ad0e9892342d91b0279210fb79a64 SHA512 e6f5aeddd89438aadff627d654ebc821a0b0e1a600ebaacc8a5fd3ec2c7c716f593757d00501311736d28f6d4276899667d6901d70836af208ff7d181b5b680f
 EBUILD at-3.2.2-r2.ebuild 2445 BLAKE2B 6ff44c9508fef800162d30088dbecd66a4201801e7ddffd4cbf2c52608dc065969b9aec4c4f3bca31e94efd464f733cee65964e79bf0f20ee238a201208ef4ab SHA512 3ed1a372a9817b4f4326f69e83a1ccf6df037c214de8983c88143c32bb2f4fe324d67dcdcedee019907ac63a38f19424bf50b22c2d7df0aa72d42e60c59c5fc9
+EBUILD at-3.2.2-r4.ebuild 2486 BLAKE2B 4a9c4d636de18c0bfa3c915c22085506ea26bdcbac745a0540201d1599d006325a6e4cbc95ecb526019cfa57c3c48133344cf93608b750d924d57cf5d36c0262 SHA512 9482eef15060a75fd7dc13cdc45614bc49bb6a0ce707c176426bed8d953da62db1c44f2c7136434d54b1494c0bf688c446f9bcbf321843028d565b004fe7ee6f
 MISC metadata.xml 365 BLAKE2B 326916275508e7a048be0e49cd22a0cfe0b0164aff8cc8130ae591f9141636408e3d12e54e969cdf00cfe9fef77fc3b2f0d376eff0ee6205caf2b1823c45c52a SHA512 8adf238b32d5be3a56e33342e358c4376e90452603b03b931501411009a299dd2a34cc9a252d4459d5b275d91faa4c78e7d3c8a430a37d588dc3c95d91e9246b
diff --git a/sys-process/at/at-3.2.2-r4.ebuild b/sys-process/at/at-3.2.2-r4.ebuild
new file mode 100644
index 000000000000..fe7662ea1a4c
--- /dev/null
+++ b/sys-process/at/at-3.2.2-r4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam systemd
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Queues jobs for later execution"
+HOMEPAGE="http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html"
+SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/a/at/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam selinux"
+
+DEPEND="
+	acct-group/at
+	acct-user/at
+	virtual/mta
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	virtual/mta
+	virtual/logger
+	selinux? ( sec-policy/selinux-at )
+"
+BDEPEND="
+	>=sys-devel/autoconf-2.64
+	sys-devel/bison
+	>=sys-devel/flex-2.5.4a
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.8-more-deny.patch
+	"${FILESDIR}"/${PN}-3.1.14-Makefile.patch
+	# fix parallel make issues, bug #244884
+	"${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
+	"${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
+	# Fix parallel make issue (bug #408375)
+	"${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
+	"${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/at
+		--with-jobdir="${EPREFIX}"/var/spool/at/atjobs
+		--with-atspool="${EPREFIX}"/var/spool/at/atspool
+		--with-etcdir="${EPREFIX}"/etc/at
+		--with-daemon_username=at
+		--with-daemon_groupname=at
+		$(usex pam '' --without-pam)
+		$(use_with selinux)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	emake install IROOT="${D}"
+
+	newinitd "${FILESDIR}"/atd.rc9 atd
+	newconfd "${FILESDIR}"/atd.confd atd
+
+	if use pam ; then
+		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+	fi
+
+	# Preserve existing .SEQ files (bug #386625)
+	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
+	if [[ -f "${seq_file}" ]] ; then
+		einfo "Preserving existing .SEQ file (bug #386625)."
+		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
+	fi
+
+	systemd_dounit "${FILESDIR}/atd.service"
+	keepdir /var/spool/at/atspool
+}
+
+pkg_postinst() {
+	einfo "Forcing correct permissions on /var/spool/at"
+	local atspooldir="${EROOT}/var/spool/at"
+	chown at:at "${atspooldir}/atjobs"
+	chmod 1770  "${atspooldir}/atjobs"
+	chown at:at "${atspooldir}/atjobs/.SEQ"
+	chmod 0600  "${atspooldir}/atjobs/.SEQ"
+	chown at:at "${atspooldir}/atspool"
+	chmod 1770  "${atspooldir}/atspool"
+}
diff --git a/sys-process/at/files/atd.rc9 b/sys-process/at/files/atd.rc9
new file mode 100644
index 000000000000..70df04eedc1c
--- /dev/null
+++ b/sys-process/at/files/atd.rc9
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/atd.pid"
+command="/usr/sbin/atd"
+command_args="${ATD_OPTS}"
+command_args_foreground="-f"
+
+depend() {
+	need clock
+	use logger
+}
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index d0e759dad6a8..050a3bbfa720 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -13,5 +13,5 @@ EBUILD audit-3.0.1.ebuild 4262 BLAKE2B 95c293ae585d4c8e5decbf05938012ab0fab3c4da
 EBUILD audit-3.0.2.ebuild 4215 BLAKE2B 1c349d818cd2d82a4956f61ff927a1da22cc3cfce0933b5f23a4f406d33ff4cfdb8bc54f779c8c7621f7e8ed53fb7d3447cf13f3584e9b9c6fd3c7c6a00d34e9 SHA512 34d842ff81a353ff5b5dd4ea96d83a935b394de4d10aabbe3b4fc9ab6a5c773166406c456f861acac6fab2b9fda781d94df8d766072ed566e3e6c87fc2fe0795
 EBUILD audit-3.0.3.ebuild 4145 BLAKE2B dc128f4a5f621c8d4106ee3eb86b7abcf01e11690419c76546ca46ce00eeb61a24b658d976357110bb5f13ce5df4a0921ddd745b526361a61eab3a22e6f0fb02 SHA512 19e279719d1f299515dc6b32f5a1048684ed000fc65af9eef7f78ee5faaead61ed8544671beccf9627718fb49e10d83a46cfa6131cc9d2f1e3cbf429e8d150bf
 EBUILD audit-3.0.6.ebuild 4140 BLAKE2B f7286650161ce6e8a52b58ecb564d89c6c70047ee827fcc03e64bc82741c2e210f936ad783a3ad2538459ae3cc068ee5548b338d3424aceb02895c038845f1d3 SHA512 9da6efcc1525a2c3e5e2cfcd49d531dccd61a958dcbdbb29f646450d8d0f13839e14965685fa49ce930262c44cc72ee730d1dc39679aa9ad14832a94205b782f
-EBUILD audit-3.0.ebuild 4192 BLAKE2B 415b25348c40cf38e9333ff748acfc1f36cc2d22e104d57d71ee4d0cf43a0a2625ab52d05dac4d62cf577e7f3d2364de2e4fb38f08aaf5032398e221062db7b0 SHA512 563e1772e38d538d7f4335a1671622606352eaa84c7fa3e8315dc5964e45ff184e322e700f7e47568d7b6110adb927e961bb846a0d61cde0fafcdc33a14e9baa
+EBUILD audit-3.0.ebuild 4191 BLAKE2B 5ae83eab000925774dad7ea3679f2b40c7dfadc5d9253ffc8d2127d93b33740d5fa6dde11765aca42462e47ca2408b980cc1ac168bb1e36a90fb4461df7988a2 SHA512 aeb650ef13517defd99d1ea211bede149cbeb4868ca9f3ebef7668dcbd1bee6315bcb6bc98b9fde6022553e25c9c45f394d86a757009bf42d9befdb9d6c3a5bd
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
index 5ffdac1ab82e..617c9b600659 100644
--- a/sys-process/audit/audit-3.0.ebuild
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gssapi ldap python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 55f1808bcefb..8a6afaf31639 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,10 +2,13 @@ AUX 2.2/criu-2.2-flags.patch 259 BLAKE2B 6e62d8e96ba9b2beaa4a525f14ebca1a198dae7
 AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc42e657cc819acecd52653b2b3699db3f00cb5916148c9a1a8013159716d8607bfd6443d24a2f98bd6e0abe21f90 SHA512 9010b79a01f7bab35ca23749d6e61706404cca89d5cdacd31fc32aba82b088becd9997f9a82db460e16bd84d9f38b1b35e90d3c49ad04b0f141d037e9ebafdd8
 AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3
 AUX criu-3.15-pkg-config.patch 5131 BLAKE2B 3b4cc0a2ae3dac24eb5f76a20478844e10b601a9584e8ae7bdd6a0167add2ba715c606fd7ee00aea9893c9e99a9ee42f031b85b37c7f4fc5d4b1fcf9ecff78e7 SHA512 e424d3ee684463dfab504da234c7e178a8060a83efd743d940ad8c8ebc58f5c07de7a48cd3fc333fcc67a0947ad8c9b838e48163045a2093afe5923ca6ff1399
-AUX criu-3.15-protobuf-c-1.4.0.patch 5627 BLAKE2B 8d60f73680d1da9390cc8dab92ca17c9fce85f551ef8983a0e2187d0581b4371b065e419e7ad0393743580f51242ebe5281d8784772073aa562b4f26d82d5d1e SHA512 941df22505fe48a0b504e8fda0c97aa6b615670c2419721b2cba2ce0e4e5f9dffd2f4b83691f220ede960c59dda242013aee04dfd999132eb4c83f330cb800b6
+AUX criu-3.15-protobuf-c-1.4.0.patch 6377 BLAKE2B bbfce0a7feecf2886cb5fbfff3d79ac47e28e1cd6d5d5133323c5d89be005120e38de5378f31faaf83f0698170ca4b8d5d795faaca190802d2102539032b193a SHA512 50f1e6a5cb2b69d0fbbbe1013d4d2b91af6800dfcfc2d73d83cd389118ab85dea1d2b32fb4152b56ef58373da3e8cd6e962f9c111359e6e76e399c3e84f3030e
+AUX criu-3.16.1-buildsystem.patch 2164 BLAKE2B aaa5e47ca5c822407693c795015e25b9db5208bf0c25026030c5b776769d27c4513707865fdd37eb4acd14beca4eecdcb83fe77c6c9479df2519dc0c49e912b5 SHA512 a36932081ed1aa058a60f93ec4a2c434a3ec6cad6ac221f2db22f3d01025e7de074ef3f3feda206ed50b1ed921b87cfa5e3d07e6cfc50ab1c527a2821ad33e1d
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6
 DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
+DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6 SHA512 a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
 EBUILD criu-3.14-r2.ebuild 3189 BLAKE2B e999b7fc1a7bd8bfeff3c090aa9c6eb02b6755bcf4a0927d3478589f1ca24cc3e6bac2e0bde300e3212ae287c08ed9f13577801169a348bede5c29e1e2e14e44 SHA512 d49d449c807e00b37f1621118ce90e629c1ba5882d4c7a73ac49cee8230ba3be1960ffa0aaea68e11596e8582b729f2633dba01caea66e828b0ec33ec21f8ffe
-EBUILD criu-3.15-r2.ebuild 3301 BLAKE2B 737d3a455a8d50f44c08e6ab58c275dc8642b105efe3b8b72c0584f2bb787eb10bc5844c3c2a66e04d2de73653b920db58251fdaf7b0a2d5c38b4c4ecb8d5b5e SHA512 0c36f4ecafe7420db49e1da2359a5cdfd05a29f443cc52cc22e97d399e0d35ab8b4595bdfce24941caefd22b4a7f5eb0aa40d09d271d96678376ad0a554fe39e
+EBUILD criu-3.15-r3.ebuild 3301 BLAKE2B 737d3a455a8d50f44c08e6ab58c275dc8642b105efe3b8b72c0584f2bb787eb10bc5844c3c2a66e04d2de73653b920db58251fdaf7b0a2d5c38b4c4ecb8d5b5e SHA512 0c36f4ecafe7420db49e1da2359a5cdfd05a29f443cc52cc22e97d399e0d35ab8b4595bdfce24941caefd22b4a7f5eb0aa40d09d271d96678376ad0a554fe39e
 EBUILD criu-3.15.ebuild 3231 BLAKE2B a0958fac51d7daa641f33974a98a33cfcdee066a6e0e38c0f208b22ec398f2b90eeaf4056577c01121b08045efce1a46e80322ceb2dbcd64b2de4d42f16eee37 SHA512 ff3006e68f1fa48a7eda167d5152d61d7e6166303ae14fecbe14fce0f3646e1e36385298801d8c7dbe3a72507f9de44010ba0bc79d1d736f26b6ea4f8f60a1ba
-MISC metadata.xml 490 BLAKE2B f38231e005bdb486428d6f2bb57fe791d0785877a5900edb6453243456451ed109dd5b4fa6271dc863465ee000a177649a0262ad804997468cb77ce092a25ae7 SHA512 464f6178d6546c44b602bde809c74509381ec90b074204e0820396cd8405391d6d48ca435d0bbcb280d9650e1285b84651ae9f81d3d7e9b126e39956b3659873
+EBUILD criu-3.16.1.ebuild 3552 BLAKE2B 93ac2b433ca3b6587d13a912a1b31ab1b405579353f6e6a1f2223c6ef2cc07288c2897ed958eeb80143faa057b69f55d1d8b991337ecd86538224d8556274333 SHA512 8314b275397adb3af19a1f3fec4c9e1fb9fc98f98d3759b0ce27c843f09dd73720a19a09860fa604b135c6a8b87faf238443d0347e1441e5eee72b4dab319a73
+MISC metadata.xml 690 BLAKE2B d39aa87ec4e0470cb5864776d802cc06be21866123a8db69ace61af3f686cf9b034cf6790d2a5fd5777bb02531db78ea72eb03c0f3f18195b56ea4b85205c87e SHA512 385296a53d274252d796563346bd999dbe4afa5c02b5f00ce42459ad995ce004f593a039c54f1e91fb572b849199e2669077ffda3affd031e23f4b4d1db9ff0e
diff --git a/sys-process/criu/criu-3.15-r2.ebuild b/sys-process/criu/criu-3.15-r3.ebuild
index bb76d9a19d33..bb76d9a19d33 100644
--- a/sys-process/criu/criu-3.15-r2.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
diff --git a/sys-process/criu/criu-3.16.1.ebuild b/sys-process/criu/criu-3.16.1.ebuild
new file mode 100644
index 000000000000..ff46a299a4af
--- /dev/null
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs linux-info python-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+	https://criu.org/
+	https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/protobuf-c-1.4.0:=
+	dev-libs/libnl:3=
+	net-libs/libnet:1.1=
+	sys-libs/libcap:=
+	bpf? ( dev-libs/libbpf:= )
+	gnutls? ( net-libs/gnutls:= )
+	nftables? ( net-libs/gnutls:= )
+	selinux? ( sys-libs/libselinux:= )
+	setproctitle? ( dev-libs/libbsd:= )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/2.2/criu-2.2-flags.patch"
+	"${FILESDIR}/2.3/criu-2.3-no-git.patch"
+	"${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+	"${FILESDIR}/criu-3.16.1-buildsystem.patch"
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+		amd64) echo "x86";;
+		arm64) echo "aarch64";;
+		ppc64*) echo "ppc64";;
+		*)     echo "${ARCH}";;
+	esac
+}
+
+pkg_setup() {
+	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+	if ! use "${1}"; then
+		sed \
+			-e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+			-i Makefile.config || die
+	fi
+}
+
+src_configure() {
+	# Gold linker generates invalid object file when used with criu's custom
+	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
+	tc-ld-disable-gold
+
+	# Build system uses this variable as a trigger to append coverage flags
+	# we'd like to avoid it. https://bugs.gentoo.org/744244
+	unset GCOV
+
+	# we have to sed the Makdfile.config to disable automagic deps
+	criu_use selinux
+	criu_use bpf
+	criu_use nftables
+
+	emake_opts=(
+		SETPROCTITLE="$(usex setproctitle)"
+		NO_GNUTLS="$(usex gnutls '' '1')"
+	)
+
+	python_setup
+}
+
+criu_emake() {
+	emake \
+		AR="$(tc-getAR)" \
+		ARCH="$(criu_arch)" \
+		CC="$(tc-getCC)" \
+		FULL_PYTHON="${PYTHON%.*}" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		LD="$(tc-getLD)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		PREFIX="${EPREFIX}"/usr \
+		PYTHON="${EPYTHON%.*}" \
+		V=1 WERROR=0 DEBUG=0 \
+		"${emake_opts[@]}" \
+		"${@}"
+}
+
+build_crit() {
+	"${EPYTHON}" scripts/crit-setup.py build || die
+}
+
+src_compile() {
+	local -a targets=(
+		all
+		$(usex doc 'docs' '')
+	)
+	criu_emake ${targets}
+}
+
+src_test() {
+	criu_emake unittest
+}
+
+install_crit() {
+	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
+	python_optimize
+}
+
+src_install() {
+	criu_emake DESTDIR="${D}" install
+	python_foreach_impl install_crit
+
+	dodoc CREDITS README.md
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
index 5e57fa084975..86d9cd31724d 100644
--- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
+++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
@@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644
  void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
  
  /* Get pid of root task. 0 if not available */
+From: Radostin Stoyanov <radostin@redhat.com>
+Date: Fri, 3 Sep 2021 14:14:41 +0100
+Subject: [PATCH] lib: install images/rpc.pb-c.h
+
+Since commit 1c25914 compiling crun with libcriu also requires
+/usr/include/criu/rpc.pb-c.h
+
+Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
+---
+ lib/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index f9b66701e0..575a7bad3f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,6 +1,6 @@
+ CRIU_SO			:= libcriu.so
+ CRIU_A			:= libcriu.a
+-UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto criu/include/version.h
++UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
+ 
+ #
+ # File to keep track of files installed by setup.py
diff --git a/sys-process/criu/files/criu-3.16.1-buildsystem.patch b/sys-process/criu/files/criu-3.16.1-buildsystem.patch
new file mode 100644
index 000000000000..7b83d1c8fe51
--- /dev/null
+++ b/sys-process/criu/files/criu-3.16.1-buildsystem.patch
@@ -0,0 +1,56 @@
+diff --git a/Makefile.config b/Makefile.config
+index 6e3e1b062..830a66e83 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -5,9 +5,6 @@ include scripts/feature-tests.mak
+ ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
+         LIBS_FEATURES	+= -lbsd
+         FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBSD
+-else
+-        $(info Note: Building without setproctitle() and strlcpy() support.)
+-        $(info $(info)      To enable these features, please install libbsd-devel (RPM) / libbsd-dev (DEB).)
+ endif
+ 
+ ifeq ($(call pkg-config-check,libselinux),y)
+@@ -25,8 +22,6 @@ ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
+         LIBS_FEATURES	+= -lgnutls
+         export CONFIG_GNUTLS := y
+         FEATURE_DEFINES	+= -DCONFIG_GNUTLS
+-else
+-        $(info Note: Building without GnuTLS support)
+ endif
+ 
+ ifeq ($(call pkg-config-check,libnftables),y)
+@@ -41,9 +36,6 @@ ifeq ($(call pkg-config-check,libnftables),y)
+                 $(warning Warn: you have libnftables installed but it has incompatible API)
+                 $(warning Warn: Building without nftables support)
+         endif
+-else
+-        $(warning Warn: you have no libnftables installed)
+-        $(warning Warn: Building without nftables support)
+ endif
+ 
+ export LIBS += $(LIBS_FEATURES)
+diff --git a/lib/Makefile b/lib/Makefile
+index 575a7bad3..af88668c5 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -58,8 +58,6 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in
+ 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
+ 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+-	$(E) "  INSTALL " crit
+-	$(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
+ .PHONY: install
+ 
+ uninstall:
+diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
+index 871e55921..50745c294 100644
+--- a/scripts/crit-setup.py
++++ b/scripts/crit-setup.py
+@@ -1,4 +1,4 @@
+-from distutils.core import setup
++from setuptools import setup
+ 
+ setup(name="crit",
+       version="0.0.1",
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index fd89c4dad3f8..bec8a7d57bfc 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
 	<use>
-		<flag name="setproctitle">Make process titles of service workers to be more verbose</flag>
+		<flag name="setproctitle">Use <pkg>dev-libs/libbsd</pkg> to make process titles of service workers to be more verbose</flag>
+		<flag name="bpf">Add support for BPF programs via <pkg>dev-libs/libbpf</pkg></flag>
+		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index faac0d712926..0c2520bbb85f 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -8,9 +8,7 @@ AUX fcron.init.4 2589 BLAKE2B e84ffd9d1b5a3cd1ee60c426cde67a3e7bd5a853d2cbdd943f
 AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec76854dfc4c84283dceafdc84f2dec9dfcb95dd5a39d90f31c828b819d29122b2b7b2135f4c65899 SHA512 f0c74c2cd601750f7de8d9926278bd79026b236f2bda4033fe1961c48171b3aa3712bd8d8917f9c784bf0ce54ed09781572cb7e9397d9579a8ba6a114c1e5c2e
 DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd
 DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6
-EBUILD fcron-3.2.1-r4.ebuild 6984 BLAKE2B a0ffbc0ff0c143eff057010923b90a0fe379c8d9d55e756d7fc9b13ee68390aaf4aed26894bda92ccf5cfe2276a1269db8f517a9adba0aace662dfecee796790 SHA512 a44daaee4c1d15644427faa1f345b7c141e5c3bb27406f2b4a4ccb9c2819cd951a6fd475d508be3f485cb7acc34aaba4581b9527442de3a0e2865258b0c56a52
 EBUILD fcron-3.2.1-r5.ebuild 7093 BLAKE2B 7bcc217ad1f34b2991a3a35a629123667fb63c0c488df39ee94fc93538f4186f548faed125a717b0c0bce06fbad25289112593cf23f03a8cb5d25de49c222c79 SHA512 6d6815b015b5e20d8ebab26c3736aa8a503f42b5987e30c71ee3134bc1f6735e3aa8f442f16288f535c8febe16ee8d1dde878575ad5b6b07896175347116445c
 EBUILD fcron-3.2.1-r8.ebuild 7075 BLAKE2B 209a223dfbc5e48b45799c71e4469a31822f4d7140bdca822c3b1d85e23d060b072b2eb299742ddb6b519112171d308831584fafde49a0f12c58cd87d0c7699a SHA512 cb92008c7dc64963a35cb3dfb934a7dab924a4af857d5f5bb1362df3c608166fd4a7b856808cb2e5991d364e7e7a142c7148a1aef5180d8854910862a662e44a
-EBUILD fcron-3.3.0_beta-r2.ebuild 7120 BLAKE2B 5397bbb8a5283761ca7df55dc24aab398d3a6c20837261e9070e465a08c50e09a8a01f84d47782ec87e047838f553b30dac9f92d6895e510c4b97a9f6052aa43 SHA512 218af6c1327b7c71bb69cb17090d0ccd89176f0abb8a1704ab9a6d94e0a056884f03c153a57604e0fdc1d2c21a4f569dc30d9ee9a359025e523edaf89ac192e7
-EBUILD fcron-3.3.0_beta-r5.ebuild 7099 BLAKE2B 8fc54fb1c7907ec1d2488b6af1d237dc1076a43b705d5dcf91e9d74cf02e708854443bde424f212b88f612be871c6d6cc8ec6da90e104f9a5225cb0aabf99294 SHA512 0b3dce63a6512e00fc574a1f3e2282af041fc1e4324e50a15ac84920c45d0cf3b157dc5dae0915cf0f0967401822e4ddbd8ac24a2fee72b79168068fa4d98923
+EBUILD fcron-3.3.0_beta-r5.ebuild 7093 BLAKE2B 3c1e02d71a48192aa80031fecfcc0de93ed428e0991202323be3638b1ed632d2dc1dbbaa6208f8103be6b2b4bcb897cdf58b667dcf9f3660ff26d0b51e1a1d4d SHA512 0c5ac50396517e1d2ab99409bc679ec2bdff01dec463f4dc3566a36b795420ea1e8eca587c1aa569fe61570a699e5a8fa0fcc020a6e6eb5a1c096b170ea51607
 MISC metadata.xml 1237 BLAKE2B 1b5d016860601bc59b5d896e51636846728e442f9f4a89bfe484d50c55016491428365eb10da059d39858d52f80e4744fb3a7a9999317ca28e32197a97ce7ebf SHA512 7c465f650ba3fc3608cc57bb8bef4f479cd4102a384ae6b9db83d19306f536f3d52eb729a4aeda98f5c6cf9996c68018dba5424776eb2e3b8c82e60140178340
diff --git a/sys-process/fcron/fcron-3.2.1-r4.ebuild b/sys-process/fcron/fcron-3.2.1-r4.ebuild
deleted file mode 100644
index 1c7ecc01a742..000000000000
--- a/sys-process/fcron/fcron-3.2.1-r4.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-WANT_AUTOMAKE=none
-
-inherit cron pam flag-o-matic user autotools versionator systemd
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
-
-DEPEND="virtual/libcrypt:=
-	audit? ( sys-process/audit )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )"
-
-RDEPEND="${DEPEND}
-	app-misc/editor-wrapper
-	mta? ( virtual/mta )
-	pam? ( sys-auth/pambase )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
-	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
-)
-
-pkg_setup() {
-	enewgroup fcron
-	enewuser fcron -1 -1 -1 fcron
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	[[ ${rootuser} ]] || rootuser=root
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	[[ ${rootgroup} ]] || rootgroup=root
-}
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS
-	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
-
-	# Adjust fcrontab path
-	sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die
-
-	mv configure.in configure.ac || die
-
-	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
-
-	eautoconf
-}
-
-src_configure() {
-	# Don't try to pass --with-debug as it'll play with cflags as
-	# well, and run foreground which is a _very_ nasty idea for
-	# Gentoo.
-	use debug && append-cppflags -DDEBUG
-
-	# bindir is used just for calling fcronsighup
-	econf \
-		--with-cflags="${CFLAGS}" \
-		--bindir=/usr/libexec \
-		--sbindir=/usr/libexec \
-		$(use_with audit) \
-		$(use_with mta sendmail) \
-		$(use_with pam) \
-		$(use_with readline) \
-		$(use_with selinux) \
-		--sysconfdir=/etc/fcron \
-		--with-username=fcron \
-		--with-groupname=fcron \
-		--with-piddir=/run \
-		--with-spooldir=/var/spool/fcron \
-		--with-fifodir=/run \
-		--with-fcrondyn=yes \
-		--disable-checks \
-		--with-editor=/usr/libexec/editor \
-		--with-shell=/bin/sh \
-		--without-db2man \
-		--without-dsssl-dir \
-		--with-rootname=${rootuser} \
-		--with-rootgroup=${rootgroup} \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_compile() {
-	default
-
-	# bug #216460
-	sed -i \
-		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
-		-e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local/:/usr/:g' \
-		doc/*/*/*.{txt,1,5,8,html} \
-		|| die "unable to fix documentation references"
-}
-
-src_install() {
-	keepdir /var/spool/fcron
-
-	exeinto /usr/libexec
-	doexe fcron fcronsighup
-
-	dobin fcrondyn fcrontab
-
-	insinto /etc/fcron
-	doins files/fcron.{allow,deny,conf}
-
-	if use system-crontab; then
-		dosym fcrontab /usr/bin/crontab
-
-		exeinto /usr/libexec
-		newexe script/check_system_crontabs.sh check_system_crontabs
-
-		insinto /etc/fcron
-		newins "${FILESDIR}"/fcrontab.2 fcrontab
-
-		fowners ${rootuser}:fcron /etc/fcron/fcrontab
-		fperms 0640 /etc/fcron/fcrontab
-
-		insinto /etc
-		newins "${FILESDIR}"/crontab.2 crontab
-	fi
-
-	fowners fcron:fcron \
-		/var/spool/fcron \
-		/usr/bin/fcron{dyn,tab}
-
-	# fcronsighup needs to be suid root, because it sends a HUP to the
-	# running fcron daemon, but only has to be called by the fcron group
-	# anyway
-	fowners ${rootuser}:fcron \
-		/usr/libexec/fcronsighup \
-		/etc/fcron/fcron.{allow,deny,conf} \
-		/etc/fcron
-
-	fperms 6770 /var/spool/fcron
-	fperms 6775 /usr/bin/fcron{dyn,tab}
-
-	fperms 4710 /usr/libexec/fcronsighup
-
-	fperms 0750 /etc/fcron
-	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
-
-	use pam && pamd_mimic system-services fcron auth account session
-	cat > "${T}"/fcrontab.pam <<- EOF
-	# Don't ask for the user's password; fcrontab will only allow to
-	# change user if running as root.
-	auth		sufficient		pam_permit.so
-
-	# Still use the system-auth stack for account and session as the
-	# sysadmin might have set up stuff properly, and also avoids
-	# sidestepping limits (since fcrontab will run \$EDITOR).
-	account		include			system-auth
-	session		include			system-auth
-	EOF
-	use pam && newpamd "${T}"/fcrontab.pam fcrontab
-
-	newinitd "${FILESDIR}"/fcron.init.4 fcron
-	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
-
-	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
-	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
-
-	local HTML_DOCS=( doc/en/HTML/. )
-
-	einstalldocs
-
-	newdoc files/fcron.conf fcron.conf.sample
-	doman doc/en/man/*.{1,5,8}
-
-	for lang in fr; do
-		use l10n_${lang} || continue
-
-		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
-
-		docinto html/${lang}
-		dodoc -r doc/${lang}/HTML/.
-	done
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Make sure you execute"
-		elog ""
-		elog "  # emerge --config ${CATEGORY}/${PN}"
-		elog ""
-		elog "to install the default systab on this system."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least "3.2.1" ${v}; then
-				# This is an upgrade
-
-				elog "fcron's default systab was updated since your last installation."
-				elog "You can use"
-				elog ""
-				elog "  # emerge --config ${CATEGORY}/${PN}"
-				elog ""
-				elog "to re-install systab (do not call this command before you"
-				elog "have merged your configuration files)."
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if ! use system-crontab; then
-		echo ""
-		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn "due to USE=-system-crontab!"
-		echo ""
-	fi
-}
-
-pkg_config() {
-	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
-		eerror "We're not going to make any change to your systab as long as"
-		eerror "it contains data; please clear it before proceeding."
-		eerror "You can do that with"
-		eerror ""
-		eerror "  # fcrontab -u systab -r"
-		eerror ""
-		eerror "However you are advised to do this by hand to review existing"
-		eerror "systab just in case."
-		return 1
-	fi
-
-	if use system-crontab; then
-		elog "This is going to set up fcron to execute check_system_crontabs."
-		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
-		elog "Per default fcron will check for modifications every 10 minutes."
-		/usr/libexec/check_system_crontabs -v -i -f
-	else
-		elog "This is going to set up fcron to set up a default systab that"
-		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
-		elog "/etc/crontab and /etc/cron.d."
-		fcrontab -u systab - <<- EOF
-		!serial(true)
-		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
-		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
-		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
-		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
-		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-		!serial(false)
-		EOF
-	fi
-}
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild
deleted file mode 100644
index 12fc00624ce3..000000000000
--- a/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-WANT_AUTOMAKE=none
-
-inherit cron pam flag-o-matic user autotools versionator systemd
-
-MY_PV=${PV/_beta/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~riscv"
-IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
-
-DEPEND="virtual/libcrypt:=
-	audit? ( sys-process/audit )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )"
-
-RDEPEND="${DEPEND}
-	app-misc/editor-wrapper
-	mta? ( virtual/mta )
-	pam? ( sys-auth/pambase )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
-	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
-	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup fcron
-	enewuser fcron -1 -1 -1 fcron
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	[[ ${rootuser} ]] || rootuser=root
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	[[ ${rootgroup} ]] || rootgroup=root
-}
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS
-	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
-
-	# Adjust fcrontab path
-	sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die
-
-	mv configure.in configure.ac || die
-
-	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
-
-	eautoconf
-}
-
-src_configure() {
-	# Don't try to pass --with-debug as it'll play with cflags as
-	# well, and run foreground which is a _very_ nasty idea for
-	# Gentoo.
-	use debug && append-cppflags -DDEBUG
-
-	# bindir is used just for calling fcronsighup
-	econf \
-		--with-cflags="${CFLAGS}" \
-		--bindir=/usr/libexec \
-		--sbindir=/usr/libexec \
-		$(use_with audit) \
-		$(use_with mta sendmail) \
-		$(use_with pam) \
-		$(use_with readline) \
-		$(use_with selinux) \
-		--sysconfdir=/etc/fcron \
-		--with-username=fcron \
-		--with-groupname=fcron \
-		--with-piddir=/run \
-		--with-spooldir=/var/spool/fcron \
-		--with-fifodir=/run \
-		--with-fcrondyn=yes \
-		--disable-checks \
-		--with-editor=/usr/libexec/editor \
-		--with-shell=/bin/sh \
-		--without-db2man \
-		--without-dsssl-dir \
-		--with-rootname=${rootuser} \
-		--with-rootgroup=${rootgroup} \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_compile() {
-	default
-
-	# bug #216460
-	sed -i \
-		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
-		-e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local/:/usr/:g' \
-		doc/*/*/*.{txt,1,5,8,html} \
-		|| die "unable to fix documentation references"
-}
-
-src_install() {
-	keepdir /var/spool/fcron
-
-	exeinto /usr/libexec
-	doexe fcron fcronsighup
-
-	dobin fcrondyn fcrontab
-
-	insinto /etc/fcron
-	doins files/fcron.{allow,deny,conf}
-
-	if use system-crontab; then
-		dosym fcrontab /usr/bin/crontab
-
-		exeinto /usr/libexec
-		newexe script/check_system_crontabs.sh check_system_crontabs
-
-		insinto /etc/fcron
-		newins "${FILESDIR}"/fcrontab.2 fcrontab
-
-		fowners ${rootuser}:fcron /etc/fcron/fcrontab
-		fperms 0640 /etc/fcron/fcrontab
-
-		insinto /etc
-		newins "${FILESDIR}"/crontab.2 crontab
-	fi
-
-	fowners fcron:fcron \
-		/var/spool/fcron \
-		/usr/bin/fcron{dyn,tab}
-
-	# fcronsighup needs to be suid root, because it sends a HUP to the
-	# running fcron daemon, but only has to be called by the fcron group
-	# anyway
-	fowners ${rootuser}:fcron \
-		/usr/libexec/fcronsighup \
-		/etc/fcron/fcron.{allow,deny,conf} \
-		/etc/fcron
-
-	fperms 6770 /var/spool/fcron
-	fperms 6775 /usr/bin/fcron{dyn,tab}
-
-	fperms 4710 /usr/libexec/fcronsighup
-
-	fperms 0750 /etc/fcron
-	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
-
-	use pam && pamd_mimic system-services fcron auth account session
-	cat > "${T}"/fcrontab.pam <<- EOF
-	# Don't ask for the user's password; fcrontab will only allow to
-	# change user if running as root.
-	auth		sufficient		pam_permit.so
-
-	# Still use the system-auth stack for account and session as the
-	# sysadmin might have set up stuff properly, and also avoids
-	# sidestepping limits (since fcrontab will run \$EDITOR).
-	account		include			system-auth
-	session		include			system-auth
-	EOF
-	use pam && newpamd "${T}"/fcrontab.pam fcrontab
-
-	newinitd "${FILESDIR}"/fcron.init-r5 fcron
-	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
-
-	newconfd "${FILESDIR}"/fcron.confd fcron
-
-	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
-	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
-
-	local HTML_DOCS=( doc/en/HTML/. )
-
-	einstalldocs
-
-	newdoc files/fcron.conf fcron.conf.sample
-	doman doc/en/man/*.{1,5,8}
-
-	for lang in fr; do
-		use l10n_${lang} || continue
-
-		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
-
-		docinto html/${lang}
-		dodoc -r doc/${lang}/HTML/.
-	done
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Make sure you execute"
-		elog ""
-		elog "  # emerge --config ${CATEGORY}/${PN}"
-		elog ""
-		elog "to install the default systab on this system."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least "3.2.1" ${v}; then
-				# This is an upgrade
-
-				elog "fcron's default systab was updated since your last installation."
-				elog "You can use"
-				elog ""
-				elog "  # emerge --config ${CATEGORY}/${PN}"
-				elog ""
-				elog "to re-install systab (do not call this command before you"
-				elog "have merged your configuration files)."
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if ! use system-crontab; then
-		echo ""
-		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn "due to USE=-system-crontab!"
-		echo ""
-	fi
-}
-
-pkg_config() {
-	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
-		eerror "We're not going to make any change to your systab as long as"
-		eerror "it contains data; please clear it before proceeding."
-		eerror "You can do that with"
-		eerror ""
-		eerror "  # fcrontab -u systab -r"
-		eerror ""
-		eerror "However you are advised to do this by hand to review existing"
-		eerror "systab just in case."
-		return 1
-	fi
-
-	if use system-crontab; then
-		elog "This is going to set up fcron to execute check_system_crontabs."
-		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
-		elog "Per default fcron will check for modifications every 10 minutes."
-		/usr/libexec/check_system_crontabs -v -i -f
-	else
-		elog "This is going to set up fcron to set up a default systab that"
-		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
-		elog "/etc/crontab and /etc/cron.d."
-		fcrontab -u systab - <<- EOF
-		!serial(true)
-		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
-		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
-		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
-		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
-		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-		!serial(false)
-		EOF
-	fi
-}
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
index 07a27b00a822..0c8a71885714 100644
--- a/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~riscv"
+KEYWORDS=""
 IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
 
 DEPEND="
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index afcf100bceb8..2e0f962b0fd6 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,7 +1,7 @@
 DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f
-DIST htop-3.1.0.tar.gz 378838 BLAKE2B c5b09f714c27879c0f3fe0d7233d1eacb979ceb76007ee0c2720bce5d08f84d0e6b9e3747c57fca11f2354909285365749d57d597911641fdb6dd834bec23166 SHA512 bb4422591a61978d1cc5b423413820c14cc571c4660087387949f1071609da38e42be2be8485863cb19b0b957d1fdeb5b2df46212d9ddd3891871b1c9d276c6e
 DIST htop-3.1.1.tar.gz 381277 BLAKE2B 4383991e8821e4c27a4f5cb002b198fa7915465c03d9fb83324fa2df732d8553be4061c2c559b92de934b0c214bb4445b068795050e1bee2afb803d7f32b9a67 SHA512 5e4ec9b5fdf4583c8a345dcc2fe9395737e3a6e8dd8e6547800b959be084b9d57ae30bf891f79a25f6bf99ec0b6eb7eaba8bc851072c5a550de70df4178dc07d
+DIST htop-3.1.2.tar.gz 387656 BLAKE2B a9682b6f3475fbae6ab7fd57330271190ec32267c5a8f2aac845cd18c566eaa9beed642c1e67fbc9606f120df600c27ed2ef0480a29ef304875a99898c1f10e4 SHA512 7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700
 EBUILD htop-3.0.5-r2.ebuild 1779 BLAKE2B 9f84f878c7e4872fb39a1ecec2203e8fa21407837fcfe1c9d6810e2dad7bac86b52860f482468bf263a7c41c3c1fb04785c2dc91f2d0731cceab2bbec492bc0a SHA512 3b4080b629ec37e01b27c87d08a7b97f2117b192a5ea0fbee29cfbdde0629423630686c9a62ac6df213c9d8829afa5b66c8f0d9a256dfcdfcfd625657cd191ac
-EBUILD htop-3.1.0-r1.ebuild 2236 BLAKE2B 2d08fc3a6ac2e1db79192f86c29435c8dabb07447818273546316e49fa9f0403b2374bdc9acac39b251428e7530163c41a68c710e2f13602c68ddab009abb280 SHA512 b710151ffe26d66be71de687dec0532d41d4e53ec79aa4f7146beb3bcbbf16e7102a341f94c58a2b50411424273012cca7bc77ee7dbce11723ff02c011b5a829
 EBUILD htop-3.1.1-r1.ebuild 2238 BLAKE2B 2215094bf5d407b865cf79979ed8586e0d5f4c929759201899ee3d402587173eb0601600cc637bc61905eb2cc2c0f9d8b60529964aaed7a552b05a182073a3c4 SHA512 3703463a3211cffba32792546f2f7136ea3c73249ed8456ea2a54a01fa8063ab16d8bdafd1a50b527a0a3d0515c19fd052893a0cb723036af08df62c1e6d7797
+EBUILD htop-3.1.2.ebuild 2238 BLAKE2B 2215094bf5d407b865cf79979ed8586e0d5f4c929759201899ee3d402587173eb0601600cc637bc61905eb2cc2c0f9d8b60529964aaed7a552b05a182073a3c4 SHA512 3703463a3211cffba32792546f2f7136ea3c73249ed8456ea2a54a01fa8063ab16d8bdafd1a50b527a0a3d0515c19fd052893a0cb723036af08df62c1e6d7797
 MISC metadata.xml 1012 BLAKE2B 88fff3df3c1385c3745511bfbda2480189db694f4642fd744591eccee9dcc0f855cf268cc1d912cef3c042df5be1eab4213139b5909748914e6ebfaf505e3caa SHA512 fd4bcf57709b15cbd3e9cc74cfd5ca0ebf5a656a3f447e5e295bc698efd89ce46899a84a794f53a1d7ae7b79bdb0df9e5cb1c8eab10b5cb4b979b83fe5c68e48
diff --git a/sys-process/htop/htop-3.1.0-r1.ebuild b/sys-process/htop/htop-3.1.2.ebuild
index 937e09730eba..c11394f6a76a 100644
--- a/sys-process/htop/htop-3.1.0-r1.ebuild
+++ b/sys-process/htop/htop-3.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info python-any-r1 xdg-utils
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
 SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-LICENSE="BSD GPL-2"
+LICENSE="BSD GPL-2+"
 SLOT="0"
 IUSE="caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 973f6b59f7ed..9c3962c4bd05 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,16 +1,10 @@
-DIST parallel-20210622.tar.bz2 2251075 BLAKE2B 4855ee0e581bf1d3ebb7dd16e4126873f0bf4294ebfc8260ec75901b3a80126a2a7c4d11c1a997557cf37e8077be24b9f1a1e97e92629347f1a55e23e8fbd9df SHA512 084537fb2b86f284f8b09dd506a79e07856612a1bb03914deec6baefd08df4c9878ad0247a527b4bc5a6d42e1a9a11d13a4a6e304ea1c3c8083b5faaf7530937
-DIST parallel-20210622.tar.bz2.sig 2080 BLAKE2B f21c6dc3b90757e56547b88ea429e33cb04b7853cc3493a19bd3352a9e2c14f8d293ee1180cacd1449a37047e3084fa4d12dccc5767a28e2daf40d086c9f5404 SHA512 50fa1de3b40f8447c9adf5e52c23e8cf932dca0565ac663bab128f44db5e8159a399208d1a23ed6d5eff78b9cb0d6eb4ada92d642279e41d40b0c429ef4c825e
-DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b3436f4d8be89c92bf4607243ba18c6530364cd7b3b4b99cba8f7a55c8a0235819edd1dbe431de1b37716fe104cd9f72 SHA512 2b5bec76ca6db090bc93f57bd09771d264a761677adbd6f4b93256776cf65a62a5a3a4641c450b68044cb7e86c5e7202d9455d2f9b0ad0cb8ad64d6da6955f89
-DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
-DIST parallel-20210822.tar.bz2 2267474 BLAKE2B b9d75cb5ca19ca602d73fe3594d7912dc1e1dfb14264a7ce24863d77a927eb3a5bb6afbc32f963fd59f75886409ef860d3fe17b854b98ac75498d80188a59fc3 SHA512 ced70d70910aca387afa8f7dd2fe8a370d7822bb0cff5b7b18043c8bbc550f165bf59763911e108dd23651d57a54cfc72bda06b63d96eb122f88e696de8b58b8
-DIST parallel-20210822.tar.bz2.sig 2080 BLAKE2B 467e77ebce03f8014797484a450296968178fdda3306ea677c5b67a4f06747bf66f3af9310fb6166eb1cc6536678b5797d7ec71ed6e720c5e00158a868b239a0 SHA512 311b9c31f4ff900a968f96aad53f7c4a7f72099f6233434e1a9c96970af55a39e1935d529b13d04dcb15ddad07d084881da1a8afa5bf32b7a8874614b2131384
 DIST parallel-20210922.tar.bz2 2268320 BLAKE2B 1c90a1955908cf77f7f3eeda053aa2c59f106ab77e805a9b72d34c697ad3f346452bc92f31146cb46a85a20c2180e982deb53197e10054f7f693d779126a6b86 SHA512 b1d0c192e306b177362211589153b51a9f1fab670178377f16e15af14c14ceb2de98868c420c508a5d2f1c395080c3b0671fff509806a1e810ca80113cbe9cb9
 DIST parallel-20210922.tar.bz2.sig 2080 BLAKE2B 1d03a6dbe399bbf8b306602aa52815298c6c8f70d6f6111ba5a99df087f4dd96697a11c9112ec3ebcfced21c623122e08ebdff3cdf68a82adfa77bb2e2cd0bcb SHA512 02db93688d0b8941c3c37d7e99cefbf8325cf95ee4d34e8bf1a1d21a6b2e62d3e3f221a6e79ef141eef81dc452ccab5924ee41732b43dffcdb6b93863573e55e
 DIST parallel-20211022.tar.bz2 2268564 BLAKE2B 3d50e5fd078b69c7d9b0f2c27d3c853d7b731ed5a04ff74a763691e36e89bbc10b79a95ad6c96bfe760a6fc56ca3b4d86dc1a4d2315c17c1cbb307bc2300e95d SHA512 bf48f7b13ecfae7275efa5935fcbfbbc942c290daa226243c12de15f3a4579ce64c862b8bae93e5c97af798fb529d4cd750e6b83803f48c33604e3a3212fe157
 DIST parallel-20211022.tar.bz2.sig 2080 BLAKE2B 6034aee09e53c7d86430c5cd20d84e8e811df143025972c3a0b8476110e6ac0fb42307b6b13884305e916e4b5af5a367337bc0596820967af913c51e575ae11a SHA512 c0bf3ddfe7900cd83211f127c20678b24405ed0a324f8a82d44c5097bddaee862f883a028b2dc0b29a9b9111178df2cb751addb776792e95c3a9863ef5b02a3f
-EBUILD parallel-20210622.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210722.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210822.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+DIST parallel-20211122.tar.bz2 2267617 BLAKE2B 55a9243f8781a781b75d51d0d6864ae2ccd5ef80d3da5227272826b400ec9e05dc62cbfbca09cd2e342d286b4eac3f99ec6c647c285e606cc903ab05808636a9 SHA512 3cadf5be292e28c7a24653ed7d712a087d98cf7332a677a7f10c5abb260d82b8e5cbd9c61f25c77b1b08427716bd47a3483e6c1e188a594c0ef2e881aa055e83
+DIST parallel-20211122.tar.bz2.sig 2080 BLAKE2B be79d9840ec4793e5046b0bea463110ff1f637b8a5ba85628af62d2f71eaaf9f455ac6d5332c8d4a1a8fd0aa200fa645e2f0161e284ba9fcae50dabf3d238775 SHA512 725f6b0663bfb8eeae51dab0804cfcdca14b79e35c9142e2fbc99cae6ae2a354dcec6ec95c04193316258dc4f0060431c2e4f7d1500bb395b8c8dc717a5fc1b9
 EBUILD parallel-20210922.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20211022.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
+EBUILD parallel-20211022.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+EBUILD parallel-20211122.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20210722.ebuild b/sys-process/parallel/parallel-20210722.ebuild
deleted file mode 100644
index 33f0a0338b71..000000000000
--- a/sys-process/parallel/parallel-20210722.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20210822.ebuild b/sys-process/parallel/parallel-20210822.ebuild
deleted file mode 100644
index 33f0a0338b71..000000000000
--- a/sys-process/parallel/parallel-20210822.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20211022.ebuild b/sys-process/parallel/parallel-20211022.ebuild
index 184819eb8c40..33f0a0338b71 100644
--- a/sys-process/parallel/parallel-20211022.ebuild
+++ b/sys-process/parallel/parallel-20211022.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/sys-process/parallel/parallel-20210622.ebuild b/sys-process/parallel/parallel-20211122.ebuild
index 33f0a0338b71..184819eb8c40 100644
--- a/sys-process/parallel/parallel-20210622.ebuild
+++ b/sys-process/parallel/parallel-20211122.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size