gentoo resync : 22.12.2021

18 files changed, 129 insertions, 98 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index e12edafdf431..fd1fb999c1d0 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 43d5f3b1a056..052d40805063 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -10,5 +10,5 @@ EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c52
 EBUILD fprintd-1.90.8.ebuild 1616 BLAKE2B 6c34b97ff30d9d1b1e249779e74f403b78692b61cf3cb87bd12a513e63ef6017ad101d06136c209470dbf172bb34fe5170b754087ff3f5ba78fa3e6374bb6402 SHA512 6964e4b0287b10a177316295698df06a0488500a4f8d3bd70a735d7a98bd2645da608a50faea8f28f2ba074ab8419c38dd21f64aa4917fd1441ff0ca147a3d1c
 EBUILD fprintd-1.90.9.ebuild 1646 BLAKE2B ebdbca6dd9bef2a51b60cb24d9ae8e614081ace89ae84b4007c88d8a6853ac20a0b1667aacd5ac5373aa7fe0fac46c5eadc2bd3f1aaf3a5d23b770c2e311eb50 SHA512 3a68129c63d411d1b2bb8343bbdc150229f88e0124b705e1716c5b6b0cf1f9f6a0cd6f1dac04a3349a2d6b9896c2ebcb5eacd830bb8aaa77843199ef611e2dcd
 EBUILD fprintd-1.92.0.ebuild 2137 BLAKE2B 9e388fa3f8fad59afad75d144f17b78af50468fa187f76a2efe2450cda17407e46e1bc25a4ee32cbc536ada07a8614f6c13d0cdbe56a153c5cf0932d397c9d51 SHA512 b0dcd1b6a071a9418d27a9e73b02b94b348ef82f09bd6874d431dc9feb8dcd564a507ee4000b3cc4b0035483fb5309352d5b32f860477e0569087d18f703671e
-EBUILD fprintd-1.94.0.ebuild 2152 BLAKE2B e6bf424b4ac955e3b016c5ae1ef212b09980c265c3567f9bd35dfdfeaf0b9f04f2f69e8e70d1d5357a94383f561f5bf5ba29204a7d9b213d04cdbf43a4c9fcf3 SHA512 4ad3c9916295e5c2f78ad13f42db52e14411f523ed3d066f740a551fba6a6dadef17d4fb1fd8d305a02870075129bd0bf7ad9a9f61e8f0d831276c313233a602
+EBUILD fprintd-1.94.0.ebuild 2176 BLAKE2B 163b4f798e313366bbf6cd1a0959e494dac1f28c034dddbd74cb402d9d21569df2962169a88bde70346a3c9e153a0f1fe5aba35fa28edaca1030d5d4cc4a53a8 SHA512 98c0f365a171b4e617868ff72b1f3b9e2eb0927447f6cfa7cafbc0e71be1e7805296fb1d3503135be6fb0befacc872254dc26cf380e0f4c7bfcbdc3ddb368172
 MISC metadata.xml 270 BLAKE2B 0f6d61908167c717898b4ba7602bf3b429736afea65a4367231066bb481a2923d25760b31741774b37727f3dcf41ea748340899e7b4a865901036d9bdf52cf0e SHA512 f93613d657594e747e743541df6df87ef7152ccf381f343bc30ac55966bc7ea212697e350d454ddc2f7c91d9485aace053084a668a69a20d6ee74340cbfe1f25
diff --git a/sys-auth/fprintd/fprintd-1.94.0.ebuild b/sys-auth/fprintd/fprintd-1.94.0.ebuild
index 2c889e47e04f..7774c1f78016 100644
--- a/sys-auth/fprintd/fprintd-1.94.0.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.0.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 
 BDEPEND="
 	dev-lang/perl
+	dev-util/gdbus-codegen
 	virtual/pkgconfig
 	doc? (
 		dev-libs/libxml2
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index a15c34268fb4..55c2cfdfe133 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -11,5 +11,5 @@ AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
 DIST nss-pam-ldapd-0.9.12.tar.gz 791983 BLAKE2B af580d400230db709f7ac09720edd6127b3b26c6987d1e8f6d6535ad8e68fd8cb5cf2a3319e4456fb2af28aba6528f7a5cdc28463ccfee747dbbf6abc35eee87 SHA512 5eca4851a9bcb2779548d193a363a143d6106bfc6463b8d3f0c2d5d7d227ec1e680861383d4813f40b44d1be2ce5f7ed019d838f7f6796e15f96f7411d3bb8f6
 EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4538 BLAKE2B 861dc78b948cd14d4302717dfdd77940120b0c9748f232f114ee59873783b077759a805e581fe5a15fee45fc6d6e972e341f639a3c06ba7c2080a961fa4980f9 SHA512 77ddfd659cdbb1011eb38f031a0adf73e2a993cc062da3a382364a8a440f50b4a1ea18ed16794b7f1e0f0915a66025f40a57c6a83d3440a3063056b5857671cb
-EBUILD nss-pam-ldapd-0.9.12.ebuild 4540 BLAKE2B 10618e2496fee6760ad22a611dcef213f18e1796b58ad8c8a9c84e8648925b384a00d94933127ef193bd59f97a62d285e61f929fb2a6d80933df2f3ebc4e86da SHA512 e5081e9044f5a90f2eeb65432194ebe8d84fe4d1207c0d2eb9b6dee8f834535b005795431f5bb70a719ad1420c9c32aed8d3891686f33717e1d0de49bfc26b51
+EBUILD nss-pam-ldapd-0.9.12.ebuild 4538 BLAKE2B 861dc78b948cd14d4302717dfdd77940120b0c9748f232f114ee59873783b077759a805e581fe5a15fee45fc6d6e972e341f639a3c06ba7c2080a961fa4980f9 SHA512 77ddfd659cdbb1011eb38f031a0adf73e2a993cc062da3a382364a8a440f50b4a1ea18ed16794b7f1e0f0915a66025f40a57c6a83d3440a3063056b5857671cb
 MISC metadata.xml 1170 BLAKE2B 5c121a0afae864d757fda18c8546e494804c9b9d6a7d6fe2ad485b6a7bb2ed291776063407721222fa765251c9ca4d945740e8a0aa53da670747fb35cf1b8f9e SHA512 ba534679ae3b983a9b143530112f6495a4a4b5b82077095b3cc62965c1cf808c7a2d098410c00bee195112c5e7ff3afe4b368fa9a1662ce22cf48634229df7cf
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12.ebuild
index 945fc4c4e681..d6abaedaf53b 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index 1f91a86a5421..830a42dd9c16 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,5 +1,3 @@
-DIST pam_mysql-0.8.1.tar.gz 49613 BLAKE2B 1e3f6b0c8a11c8d328300fc820ddbbcd1601735de611e9317aab8f26ab2fbcf0f704e7a2c26de347fe9c4088c8171f0c278cd92e1668671871e5cd79db981241 SHA512 68aecc83c026c7616211a46b80f96fe822c8bd069a5ab6e9b170607bddac0dabe20410f78a1ac61ca1c1b2724ed0f0d99694d34bf28763270da3771c9ef05faf
 DIST pam_mysql-0.8.2.tar.gz 55023 BLAKE2B 2b278dc8cff229dd9fe9da2316f51838e6b9d57714dc07c7dfe85142ac4bb2e6c3a3de7eed7ab34917c08a07197c187434211cb7841c85f4c8d2d088309bae3a SHA512 268dd721554bc15125b6ea95b3f7b7a5f4ebf772e0ad65b6cf53d7e23d6154f10d916da774ea338a6b75427b2a6ada2b4730a57a88a15abea62a0454e7c5ea1e
-EBUILD pam_mysql-0.8.1-r2.ebuild 903 BLAKE2B 22cd8df2e94242d0602235a55c14ed295e543eba0da8d8c9b31796c533ca40c03176f56f952e1bab3bcd52082e47b47812b433fbfea85e7d4e2fe043d010e14c SHA512 d92281d1afca87de23d5350e1b1c9448971b91b4efb3bd62a7e76e735f0f9e7cab726790f59e09f2b514df9452d923a30c81e09fe0bd6d0927bdcee7719530ba
 EBUILD pam_mysql-0.8.2-r1.ebuild 903 BLAKE2B b7dd23d56044d6bab8ed08ec6b983d4a594f273b902efef0a318e0af73dbba148519756a61b27cc33a197f9eb562352858cfabd26fb74eb72f4b4a417a1149a0 SHA512 0188a9f4edfd62c060275f9cb3b158a72328ba043ea888ee89aadb897eb9991bb3ae4d0a1952e6b59a17540e4dbed3bed376105eefab71d5968cf53a2dcb054a
 MISC metadata.xml 405 BLAKE2B 7d198451e3aa26eddbdfbeae2bf0d4bccd21c37f6ff240884e0abf7e85fe5aca97f48509d76690890a41dca2916ef0df108c928f1b972ace31eb8c8a77001151 SHA512 1ecae37325853eab5d77ec19cf74a794146d2f2fd833c3b090aef29c3b337b9e4ca3513aae383b711a58942c3eafbb7ed041e5e3d58e4075e43c7608880ae8df
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1-r2.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1-r2.ebuild
deleted file mode 100644
index f4493e838aa4..000000000000
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools pam
-
-DESCRIPTION="pam_mysql is a module for pam to authenticate users with mysql"
-HOMEPAGE="https://github.com/NigelCunningham/pam-MySQL"
-SRC_URI="https://github.com/NigelCunningham/pam-MySQL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/pam-MySQL-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="openssl"
-
-DEPEND="
-	>=sys-libs/pam-0.72:0=
-	dev-db/mysql-connector-c:0=
-	virtual/libcrypt:=
-	openssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-pam-mods-dir="$(getpam_mod_dir)"
-		$(use_with openssl)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 911685c5f819..88a3933cc343 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,6 @@
 DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
-EBUILD pambase-20210201.1.ebuild 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
-EBUILD pambase-999999999.ebuild 2941 BLAKE2B 8cdd1697869dd1e1ade3db363b981631c97b7e9978165a172c20c0c04e968157dcfc76807307959b7639e22a530072868e733f0ccc1a2b16497a641318efe403 SHA512 16186f1385141d853daa0c7bada3021d9495f88d5d43ab11347ced115789e4daeecdbf57c599c16e21463c11102946ee022f3849a0ebf24ff2ce24f0d4e6f2ab
+DIST pambase-20211218.tar.gz 3366 BLAKE2B b07ae0b8f9480e0ad456fcfbd46da008182dedf3542b14c27cbe5d65a68290898751cd3e5a59cb8f040ced6316a70cdbc7afdd54ef2965a20ba537c686f76b36 SHA512 8aaaf15f9f82ce9f717a988676d00435e60bada05927843967b505a972d96a2ab7bab9971bd5476b8a8bda76c7063fa4d452818a89eccd4066f65d3f1b2fb3d7
+EBUILD pambase-20210201.1.ebuild 2867 BLAKE2B 31cbb3f7819bf1e43373155c1caa507dd75f52d99704f6f311d30d029343f8800023726aa4bd9a395ee8c7ba3f2d7e779cf98f510843ade7b7c3e3dcd8ae8488 SHA512 04ade06772081bd7565536f8acb7d23018eeda99a46252548dd79c6731812bc8b41736c353efe0da6aac6784d0617ca886f92210f42b062764893b39fb735c2c
+EBUILD pambase-20211218-r1.ebuild 2987 BLAKE2B e7354705c5fe852fd43fd1651ed483295f9af56b789907e6d9938859678d5a92f3e3a78b88e92d01fee6b8a97db27c86d0606e243b3f932522f43b03805d72ba SHA512 cfb6ef6d5639542dcc9e5d971713474fbc3e3878ab61ab41519bd8e5d1aa35a34ddec1a3cf9a774abf73c5045fedbe67aec2e22e400f4804391c1e24b6c9d831
+EBUILD pambase-999999999.ebuild 2979 BLAKE2B 999f604a69ea308b88b82bcc1c05a98f25d319fba59fcf356355d15f04b258e55070873c243e64c7e571ad65c55ee74b8d56d1ae033593a03f08e2fdd041e85f SHA512 9cf831acbc09aab08e7265bcc6313aac40ff43f2c39bed7f8414da406b9a2bbd4eab39788e31edb343628d123be5dc42fba06b0424855c33ab262f0985d11a32
 MISC metadata.xml 4061 BLAKE2B c877f6450ccfc91a3f3ee1bf10301cf21913f66a6d5f32f6698ea852006094243432a2fbc635821532355841ec074aa1ea426a745254f62e2e595d8049b3b75a SHA512 4c46b27df8f3b31c8f9474cf2b01c46014a3374c508f65970deb16476fbcf5710855322eb61d7fa65ac44a1fba60a2a223a26e890da3fed50102964f97306767
diff --git a/sys-auth/pambase/pambase-20210201.1.ebuild b/sys-auth/pambase/pambase-20210201.1.ebuild
index b4166689528b..6b1d2ac83aa1 100644
--- a/sys-auth/pambase/pambase-20210201.1.ebuild
+++ b/sys-auth/pambase/pambase-20210201.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit pam python-any-r1 readme.gentoo-r1
 
diff --git a/sys-auth/pambase/pambase-20211218-r1.ebuild b/sys-auth/pambase/pambase-20211218-r1.ebuild
new file mode 100644
index 000000000000..5719f207d53a
--- /dev/null
+++ b/sys-auth/pambase/pambase-20211218-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit pam python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+else
+	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd yescrypt"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	?? ( sha512 yescrypt )
+	pwhistory? ( || ( passwdqc pwquality ) )
+	homed? ( !pam_krb5 )
+	pam_krb5? ( !homed )
+"
+
+MIN_PAM_REQ=1.4.0
+
+RDEPEND="
+	>=sys-libs/pam-${MIN_PAM_REQ}
+	elogind? ( sys-auth/elogind[pam] )
+	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		sys-auth/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
+	pwquality? ( dev-libs/libpwquality[pam] )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	homed? ( sys-apps/systemd[homed] )
+	systemd? ( sys-apps/systemd[pam] )
+	yescrypt? ( sys-libs/libxcrypt[system] )
+"
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	${EPYTHON} ./${PN}.py \
+		$(usex caps '--caps' '') \
+		$(usex debug '--debug' '') \
+		$(usex elogind '--elogind' '') \
+		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex homed '--homed' '') \
+		$(usex minimal '--minimal' '') \
+		$(usex mktemp '--mktemp' '') \
+		$(usex nullok '--nullok' '') \
+		$(usex pam_krb5 '--krb5' '') \
+		$(usex pam_ssh '--pam-ssh' '') \
+		$(usex passwdqc '--passwdqc' '') \
+		$(usex pwhistory '--pwhistory' '') \
+		$(usex pwquality '--pwquality' '') \
+		$(usex securetty '--securetty' '') \
+		$(usex selinux '--selinux' '') \
+		$(usex sha512 '--sha512' '') \
+		$(usex systemd '--systemd' '') \
+		$(usex yescrypt '--yescrypt' '') \
+	|| die
+}
+
+src_test() { :; }
+
+src_install() {
+	local DOC_CONTENTS
+
+	if use passwdqc; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file"
+	fi
+
+	if use pwquality; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
+				page and then edit the /etc/security/pwquality.conf file"
+	fi
+
+	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
+
+	dopamd -r stack/.
+}
+
+pkg_postinst() {
+	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
+}
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index e0387fbc8c5a..866bf8998786 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit pam python-any-r1 readme.gentoo-r1
 
@@ -83,6 +83,7 @@ src_configure() {
 		$(usex selinux '--selinux' '') \
 		$(usex sha512 '--sha512' '') \
 		$(usex systemd '--systemd' '') \
+		$(usex yescrypt '--yescrypt' '') \
 	|| die
 }
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index f57f2fd09736..e946af257bfb 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,5 +4,5 @@ DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a03926005
 DIST polkit-0.120.tar.gz 1626659 BLAKE2B 745727445b4946d44b8ea470d21ac131ca7706e83f5dbaf85cf3541ac60a1bbe23b3bf3172a62d9256ebb3dae02d2b2d476e3e0f7fe79a80c47864a120e62ed9 SHA512 db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
 EBUILD polkit-0.117-r2.ebuild 3330 BLAKE2B 844d327d9f6c391ea89b305677adf98e823718f620c307586bf96172678dc94a4b1a5ad870e6ebacf0fd579839b73359de33fa0173f46c425e0f7cd0228c6bd3 SHA512 99673f56722f4e105eaad28a3f8e1a9aee1664e5552e940bf286bf84a76a52145745905f080f859ce4991a29ce6f3e47f6ab3d59a012e69ffd71de98557ca8bd
 EBUILD polkit-0.119-r2.ebuild 3302 BLAKE2B e56f5505dfdfa245ed3dd78199de5439d7ff6d5ddb8778d785c69e3900dfdc7f9d4aa46e101bab2eee7ebdb4097eecfda0f9d29be97dbd348629cc218a988d87 SHA512 32e836e9c17bb7aae519031beaf35a3cba4da983bb29e875b7dcbc8ffae5d0a15218147904d0d942557210e240ffb252d9d548c6bf508027be337feba9e61923
-EBUILD polkit-0.120-r1.ebuild 2934 BLAKE2B 0bdf0ec9787d3ba3ee8156b15df529cc70c63f6c69924c25d3ce71472a3b99ead9133405bc4bc2df6dfd2b36a7ce976a8ba729953536efd36e81dcfdaf9197dd SHA512 c66e8ec64792d5e7ac7520746a83d3fd825f67e2ef9ae79178356a10fe9fde224fabdf9191c62319487e2e51cefd1fadb38d136f3e63a3d8c11a16825e69715a
+EBUILD polkit-0.120-r1.ebuild 2929 BLAKE2B 26c0521d065a3ec363876a1e7dad8f76063a2255da89755b892cdba7f343f942866fed290a89ea471188f38ad5ae3eaed59e1805ea06caccc984bcb0d46af9c1 SHA512 3712df9a5233ad467493dead6ad46b4919b527576191aea4c9c88825c3f39422f63051b3b8b983379936f1753518744bd63606b5f811068dc6402c8ba2393b4f
 MISC metadata.xml 410 BLAKE2B 5b1bae6f1252bbafdc0ddd0eefeaca74f93ed183f46a2e4f22f36656c681d87acdd6ea86807a4b68350c1c8197cb97b6b421a88f5f0a2322b1fd85c599c09b39 SHA512 9b097838f0e0dfdbb788e4794e667d43ba3f3a08de45fffa5826142b8416afde68ec0202c429f1cd6f79ad9681b050c8aef736a8399d9551ea8784c97c123766
diff --git a/sys-auth/polkit/polkit-0.120-r1.ebuild b/sys-auth/polkit/polkit-0.120-r1.ebuild
index 8860ae9bfa5f..0f0f2900683f 100644
--- a/sys-auth/polkit/polkit-0.120-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.120-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
 IUSE="examples gtk +introspection kde pam selinux systemd test"
 #RESTRICT="!test? ( test )"
 # Tests currently don't work with meson. See
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 43459b4734cb..00af51688cfc 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -5,6 +5,6 @@ DIST seatd-0.6.3.tar.gz 38525 BLAKE2B e1bdb85f9432a9a407ea7a72ed5790debf01a41054
 EBUILD seatd-0.5.0-r1.ebuild 1149 BLAKE2B 5d2dea641973020351e6eceda0c32c6d91d8548406cee5b3713cd64a850c08975c2e1bd8be7a2b4f09581d4b88ed11b8fd103e81c30b70c3b101f70d7437f29e SHA512 d60e0a835c74ccd649dc41011d26b4fb5d0a7241b3a5ec17cca3ba1461510bfb2635f5a70a564648de54697625ab6b66d0edbe03ce69a60554b919bb45d31145
 EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
 EBUILD seatd-0.6.2-r1.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
-EBUILD seatd-0.6.3.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
+EBUILD seatd-0.6.3.ebuild 1261 BLAKE2B 0825323ec59d7c6f13f014f07234c047271147ecc53fc6643dd7f6bef0baf66334551b65041fa9d903a27721ab0128b05f46173f786e2df20cefe367aa4acfd3 SHA512 3b6126214352000836529229e956be69a165d234c70ecd689b04919d0538f1aea7a0ca3a2101941bf3d56f8c6220dbd724af5fb3d19f8d78b67ddf0620515b4d
 EBUILD seatd-9999.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
 MISC metadata.xml 660 BLAKE2B 9375bcc1d6a5622abfca0cb2a55e2e319780488ed085efdbef58299259de54842a84b8af2f57eb6fe3ad7baa436d83b8116ac9afb6c8e76a8d69c8776eb7438d SHA512 307d307fb80b15a6d2ecfce5784ebe2dc1882e5e62e80d6d3cdf529e07171ca1364241912368e69893daebfed1ba4f1298e54e8f7978e1dcdc777f97f9a97784
diff --git a/sys-auth/seatd/seatd-0.6.3.ebuild b/sys-auth/seatd/seatd-0.6.3.ebuild
index 2c8b264374b9..c8a6b71abb97 100644
--- a/sys-auth/seatd/seatd-0.6.3.ebuild
+++ b/sys-auth/seatd/seatd-0.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index e7e0e508bbfc..5aec1659a3c6 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,5 +1,3 @@
-DIST solo-python-0.0.30.tar.gz 34932 BLAKE2B 6787d9c6e102cd2cb5579be0cb3ffbbe76b3ae90f4fa6891b6a1ca3e76436568a949daa6796fc17c9868d10d5de3b0dd377619936eccb0d436a284a35efa40a9 SHA512 bba63e598ef585ef49e98f3ec2a79911cf8af3fc38c9407bd91b7500dc55bf84f365664e6f80ff0ed3553ce93f5d61ba11c5301e8b36d6000c7a922857adaa5e
 DIST solo-python-0.0.31.tar.gz 34959 BLAKE2B abc7bb014bb6eedcd0178cb600c626ca6e2b4773083916db698c0dd9639208206da010470f77813074137667afb5c6725311c3406762a8ab5a029e9966b227d6 SHA512 e8c81524b6d10bc38898b19e35ab2f7b95bea7906553de9e0598fc160b5b9b61f4f8b40e2238631738e1b69ef52652af1b3e84aa0a3552126929c4512210c1fa
-EBUILD solo-python-0.0.30.ebuild 1141 BLAKE2B f3ffe66798b2fd3f075da98ae820b5ef4bc7f90c1ee050108074c0f2a7c30385f704c7b38b2778973b5b6531586c6ee56a5d1f45b9443849186e55dce32e81a7 SHA512 20da743018fe89e84fb4ad2a752eb3c597a7ed43ab9a54f6d8c586151a3b8ac31386832187264c06fd0c10729769e3a3389ffe9db1d66e13698686723700cbc9
-EBUILD solo-python-0.0.31.ebuild 1142 BLAKE2B fd7f4cdd273b910a68637ecabc16dd08465c7d440926f96d4b5b4ec398bdd7ba61025a74c3f78bdd622333fb31f4bb4f8db080fdc19bb9eb1868dc325580eba1 SHA512 43d32ffdff81d0d31a67fb0ca5e78af834e1cb7996c0ccd42e12564958d4dab4511c61140588a3129c4ae931ea445d4e7f63240ce96ccbbe935a90b7b4b82830
+EBUILD solo-python-0.0.31.ebuild 1141 BLAKE2B f3ffe66798b2fd3f075da98ae820b5ef4bc7f90c1ee050108074c0f2a7c30385f704c7b38b2778973b5b6531586c6ee56a5d1f45b9443849186e55dce32e81a7 SHA512 20da743018fe89e84fb4ad2a752eb3c597a7ed43ab9a54f6d8c586151a3b8ac31386832187264c06fd0c10729769e3a3389ffe9db1d66e13698686723700cbc9
 MISC metadata.xml 699 BLAKE2B 5f330f4e497c90f563c2171d6297c2c989885e93140d49e96f97d7cf560bcba67aa30b4de5345cbb9abf49e4ac41fad57985070421f736e28ea9dedbd2a00c76 SHA512 c10d907f43f3646c7f5ddb81aad69f294ad068d185abd9e81ee03fa6d0a8005af7e002a015d89dd2ce66065c46d032249670e059b4eeb38ff0c242449d98a509
diff --git a/sys-auth/solo-python/solo-python-0.0.30.ebuild b/sys-auth/solo-python/solo-python-0.0.30.ebuild
deleted file mode 100644
index e8cd0529f6d9..000000000000
--- a/sys-auth/solo-python/solo-python-0.0.30.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool and library for SoloKeys"
-HOMEPAGE="https://github.com/solokeys/solo-python"
-SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/intelhex[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# For some reason the version file gets omitted by src_install (a bug in pyproject2setuppy?),
-	# and in any case there is no advantage to using one once a specific version has been released.
-	sed -i -e "s/^__version__ = open(.\+$/__version__ = '${PV}'/" solo/__init__.py || die "Failed to set the version number"
-	distutils-r1_src_prepare
-}
diff --git a/sys-auth/solo-python/solo-python-0.0.31.ebuild b/sys-auth/solo-python/solo-python-0.0.31.ebuild
index cdac36e7295b..e8cd0529f6d9 100644
--- a/sys-auth/solo-python/solo-python-0.0.31.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.31.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]