gentoo resync : 31.05.2021

16 files changed, 86 insertions, 16 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index fdd45c9fcbc9..af17d4300b91 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 9fb4c58cf5d5..3b3f1f96ce53 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,10 +1,11 @@
 AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91ca59077438a1f07d1ecaf1cd68556cf1915460cacb2e3a062702dd84c8ca9729e7c4dfdd385a0435329784c8a33b4a66 SHA512 55435fa4cf902299f4957361393e7d1c5394970193fd814019d4dd5f9abddce3a7ea1da507eee4712f2f98284a989af8b22b6e1ff8a71e8faeb82417d1891c97
 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
+AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
-EBUILD elogind-246.10.ebuild 4150 BLAKE2B fb995c86ac9ff93d5948bde0f224029c16d86e0e9e31b7a11ddbee7da3c1615bef26c650dff39635696074ae7714895919bce1c6c893959b6f06fa79e771b82e SHA512 62b538173b868983f5c740590326a6ce216b73971f9ac33bc97442c0ff18fc4ef92d83655378f44210eb6b226cd9914495f0542ae2eafae9e1bcb890f3f00ee1
+EBUILD elogind-246.10-r1.ebuild 4197 BLAKE2B 7373c487c57a2f366b594c727fb238c54f358fa9c13c9644b9aa598d967cccd9b7052b3865a71324bd57dd76753fb614c78fec4cfc5c5fced7c3314259485bb7 SHA512 b2adb287169a0264d6177805165302928f7f43db02c1cf3e1f0977e03e1e5f31efb90e6062c0eccd8900ba6046a887e9b8c38ee6cd2c44722e4c1c938a160e9c
 EBUILD elogind-246.9.2.ebuild 4136 BLAKE2B c02a85f4271d3fd3d0ef875d86e681cc0c1ed0e5d86b3c19399208d8e9826ae54e95a892d850c1ebda823b497cc3cba848eb689c67e637b548e27510c57124df SHA512 a7623ce84e631ee83c05373351f687bd7b962b56a73b9988c3c218b26a0fefea78948887c11ca5814001caaa15374aea7bea2b9a1cceacb539059ccc6593abdb
 MISC metadata.xml 492 BLAKE2B 825e86df619311ed9abf5f64f274f783fa9b3523d455c0608a16c3a39b58db0bc52099a3aceb3e2c7fddf28a292a75733cc7e5f8694f1d1b2006c702946a8d30 SHA512 d1af1f988c3211ac6520b02193e9e1b1c0d9dd204a567f8468516ebf4e4d8dc1fab56de0e0031bdd58a2f1336f1b1c8662ab9f56753948f1dd297a336ae40187
diff --git a/sys-auth/elogind/elogind-246.10.ebuild b/sys-auth/elogind/elogind-246.10-r1.ebuild
index 8f9df3e3daf3..d9ba2eff1984 100644
--- a/sys-auth/elogind/elogind-246.10.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 inherit linux-info meson pam udev xdg-utils
@@ -51,6 +51,7 @@ DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 PATCHES=(
 	"${FILESDIR}/${PN}-243.7-nodocs.patch"
 	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
+	"${FILESDIR}/${P}-revert-polkit-automagic.patch"
 )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch b/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
new file mode 100644
index 000000000000..5237b7abe72a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
@@ -0,0 +1,38 @@
+From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001
+From: Sven Eden <sven.eden@prydeworx.com>
+Date: Mon, 8 Mar 2021 08:40:08 +0100
+Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed"
+
+This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e.
+
+Removing polkit support with -Dpolkit=auto when libpolkit is not
+installed, removes the whole interface. This makes it impossible to
+add polkit support as a runtime dependency.
+
+Bug: #167
+Closes: #206
+Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
+---
+ meson.build | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2dd05db3c..f38551f55 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps
+                 message('Old polkit detected, will install pkla files')
+                 install_polkit_pkla = true
+         endif
+-#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167
+-        if not libpolkit.found()
+-                if want_polkit != 'auto'
+-                        error('Polkit requested but libpolkit was not found.')
+-                endif
+-                install_polkit = false
+-                want_polkit    = false
+-        endif
+-#endif // 1
+ endif
+ conf.set10('ENABLE_POLKIT', install_polkit)
+ 
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index f1c64f3dc6f2..977d0c9aadcd 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -4,11 +4,12 @@ AUX nslcd.s6 44 BLAKE2B af69fd0202732721739501a65f608fb9fadfdd7e8a58052103a347bd
 AUX nslcd.service 320 BLAKE2B 18a675fcc821d2c5f7766c0739c3bada8550e5e55f7b589fd9806bd961e9d4149be4a145ac51b9aeabad49293d70c726c1a8dd6a78ff724114e3b34e2270c32b SHA512 f04b66e05bfaefd485a4251c46d2b172a193be77554595086241dcd66a7787cf7678c8e5f6be954192a85a69fd2426965e4ca82c00e610ead8c6dd93a9aa21b1
 AUX nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch 537 BLAKE2B 40167724748124428393c2cc0d70c2fa88abd5fc9c2b12739d79f6dbd9f39e7b53351a68fb6db0e4f11bc0f40b960d1ab4ea256ab1f8aa8c75fe9601fc5674c3 SHA512 2fd21d4851f255264cd0e95f88f45fbca62ad8124c1326569c18bea769c205d4992f88a5fff7ca4bf19cd07c9123a39ecd3df2d5221a0430fb1d25d7b4668a30
 AUX nss-pam-ldapd-0.9.11-relative-imports.patch 12280 BLAKE2B 9ae632b572a9a997cf704698b6aca7fc19c32e1f08f29de0f0457a6ee567596abf09ed2aeec2fab5535e98280eb887f6adb7a29ad4406216f0a3355c9931b2aa SHA512 2275d1c8ded5d8c2824c97dc361e84b62613453ec502a9685d7e27e54bc1a72da7830d119727f8f1e4df000b1dff53d631f8967eaf70bf75e043e0e302d9afac
+AUX nss-pam-ldapd-0.9.11-tests-py39.patch 1143 BLAKE2B b4eb5d25ba9c40f00f3d84c9385a1ffc23cf5ec357ce33ba74c954378144e4d88fb811de9c1e802283f03d6be88052677624c1f75bc481938762c5bb0cef9b69 SHA512 f0d0d3345fd83bf1ecbbd5bd7784836b8d8c27b0238a4aefd15ad34b93ffbfc8474edd5a3c7955a2c90e822e426a59f578c6dbb80aed6c2e4b15543ce9dfc286
 AUX nss-pam-ldapd-0.9.11-tests.patch 1226 BLAKE2B f8fd1170bae8d206dab6fb11437db7290b488caf8f609f5676f46f55f3d31ba5a4fc59c5484e7151da8fb4a20c50f6739fa7de3115bc8ce706022422e753f31b SHA512 e60122304d4cad52a8e11ba804fd432da8102dc021e9272d0e284d88f3a1b5e7392ef71bfcb460eb3a5faf9ae7e95de943c4e35da03b17d029f058496b6a8087
 AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a03b717c8a0caf03edfbd3c9eba60391a3e92504c01093e254294ac3e063045de07df260573371a5405c8eea87917fc30056daca SHA512 a01a15b94977efc37d9d518049aaa52f308b0e3597aea6e17ca7badc790cccb617eb9154dcd3fef897b4093b147f8261dfc32ac2fc0ba48ba82573653fa358d8
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
 EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4159 BLAKE2B bc4e732144a72a94bf9f8b98db8410ebf7e67a06118cd79461dab556eaac56e4bb9da6a151e07f35e5d7e324ff27cfac428091721c8696efa89325f5d2154c65 SHA512 9108eff0d788cca661f8789e121f9cf9f9331f56db4d3cec094d8376ced0c7f8d9742d1e10b63d1c774f617354eef94d6adef3ba23c765cb7314b314454d0764
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4322 BLAKE2B ea22fb7707ad6d45aff2002aa4d72b9ec36a59864efc18fc172011ca10e02bff0ff1e2c76f65352c4507bd8ab7662a147ad768ec3c6e36244c4efdcb6406d268 SHA512 0e95df63aee69d7c9b0a8b82a924641f5afb2c35d6587313f06a4658f6b841832ac2b16110d3b424f2bc7c03a5340c114d49e1784e5bcfc365c84ee889f3798d
+EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4505 BLAKE2B 7f5a6430cab68536705bc6c5c9cec24966f0ba20c7821d67de11f78752dcc58e77f5414376a25d38cea44efe22eb69570aff4aad6357d72bc47a974ad92e2c66 SHA512 afb00da2ba95518aef803135eb591f3ecc4529774f6dd0994d539c9e88d0e3cfc0265b7c3285354145ac5177bd6cff23b62660e0aa31e382f3a03176516483e1
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-tests-py39.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-tests-py39.patch
new file mode 100644
index 000000000000..6761de73d6ce
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-tests-py39.patch
@@ -0,0 +1,26 @@
+diff --git a/tests/test_doctest.sh b/tests/test_doctest.sh
+index 5b3a13d..82749a2 100755
+--- a/tests/test_doctest.sh
++++ b/tests/test_doctest.sh
+@@ -53,7 +53,7 @@ do
+   if ${python} -c 'import ldap'
+   then
+     echo "Running pynslcd doctests with $python..."
+-    PYTHONPATH="${top_builddir}/pynslcd" ${python} -m doctest -v "${top_srcdir}/pynslcd"/*.py
++    PYTHONPATH="${top_builddir}/pynslcd:${top_builddir}" ${python} -m doctest -v "${top_srcdir}/pynslcd"/*.py
+   fi
+   echo "Running pynslcd doctests with $python..."
+   PYTHONPATH="${top_builddir}/utils" ${python} -m doctest -v "${top_srcdir}/utils"/*.py
+diff --git a/tests/test_pynslcd_cache.py b/tests/test_pynslcd_cache.py
+index 8d3d02a..e7b19c0 100755
+--- a/tests/test_pynslcd_cache.py
++++ b/tests/test_pynslcd_cache.py
+@@ -27,6 +27,8 @@ import unittest
+ # fix the Python path
+ sys.path.insert(1, os.path.abspath(os.path.join(sys.path[0], '..', 'pynslcd')))
+ sys.path.insert(2, os.path.abspath(os.path.join('..', 'pynslcd')))
++sys.path.insert(3, os.path.abspath(os.path.join('..')))
++print(sys.path)
+ 
+ 
+ # TODO: think about case-sensitivity of cache searches (have tests for that)
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
index 3d6590078bca..3f748952208f 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..8})
+PYTHON_COMPAT=(python3_{7..9})
 inherit prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
 
 DESCRIPTION="NSS module for name lookups using LDAP"
@@ -53,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}/nss-pam-ldapd-0.9.11-use-mkstemp.patch"
 	"${FILESDIR}/nss-pam-ldapd-0.9.11-relative-imports.patch"
 	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests.patch"
+	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests-py39.patch"
 )
 
 src_prepare() {
@@ -100,7 +101,8 @@ multilib_src_test() {
 }
 
 python_test() {
-	emake check
+	cp -l "${S}"/pynslcd/*.py pynslcd/ || die "Could not copy python files for tests"
+	nonfatal emake check || die "tests failed with ${EPYTHON}"
 }
 
 multilib_src_install_all() {
diff --git a/sys-auth/pam_skey/Manifest b/sys-auth/pam_skey/Manifest
index a1e280abce58..5e5305270385 100644
--- a/sys-auth/pam_skey/Manifest
+++ b/sys-auth/pam_skey/Manifest
@@ -1,4 +1,4 @@
 DIST pam_skey-1.1.5-patches-7.tar.xz 9408 BLAKE2B d87da6c4606431618a1a4d75981809cbd91a8e5e3d1f9eae6fbb222e146d451f7c099f9b437829304b647a20c6200797732e9d01451cc4911abba7843151e36c SHA512 8bb39c2d173468c38b4d2bdac186d3f27e868c2be9dc6feffba957d4d33bc8e597c48e4638e5de09829000961fbf8b72f0ba577f232bebdfaa4c2961ede58838
 DIST pam_skey-1.1.5.tar.gz 76963 BLAKE2B ded4a4e43b174338cd1beefce65314cc906db928593dd5eba2ba1be9cab33844d8fd38cb7d3b952a29da632b671c468e0dfe7f0f1e0d167397320cd9ca6d35e1 SHA512 12817cedf15a3b2287982e4beab5d3b388239cc0a1e141e66e41759ddb2da7fb9dd0df12202dcc8140db0868c8df1a8d19d5859224179e2419ffefd691cb9834
-EBUILD pam_skey-1.1.5-r6.ebuild 1567 BLAKE2B 855556d2ff820be4401630e53b3b4f1ae0906150d7ed0401f8924f84c1b1aa52f74e9f94d70c5be659cf5d9385202924fceef4ced659bcd9967b0936685e8009 SHA512 33285229181a1c9d20e7829cc6c2766ca63e481e846490b8ea21c5b92de52c85dfee349cc81e97d686af7469500c4a5403f5eddd78636f4bae6bbfdc6732d88c
+EBUILD pam_skey-1.1.5-r6.ebuild 1569 BLAKE2B 00126f69a7f44b0a87711bd0c1b46e98369ca795cf4a029a984aa1e1211f46ac7cb04c0d79e03c15c8a1abf323d689d81291480e1f6804766bee5d240d372fe2 SHA512 f6d567d3ee6a4affe913cf44a6c03f5d0b14334704e33e719201e2b362056b2d5bcd99f5b52b3ff6f8df60669a38338ff36c1e1b7a46b515d2371de01cfd1351
 MISC metadata.xml 298 BLAKE2B d846164710bf706b6d7fda795b74a5bf0a3303eb7c5c67b6ed422ad9002d6f3ae96abaaa086b2c223b71efd19ed2b8bb7a3313a0b3fda523f816a34e9b639f14 SHA512 97d05da80a58ee2510de2ba718681ebb5b183dd113de6b8ff3c05a43b2fbd488fff78a2e7381b0cbf0b36aeab09e125a629c2259d0ce871e9cc7a80cff1bebf5
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
index df9cb74af248..47f2f49f97fe 100644
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
+++ b/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
@@ -19,7 +19,7 @@ RDEPEND="net-libs/libnsl:0=
 	>=sys-auth/skey-1.1.5-r4"
 DEPEND="${RDEPEND}"
 
-PATCHES="${WORKDIR}/patch"
+PATCHES=("${WORKDIR}/patch")
 DOCS="README INSTALL"
 
 src_prepare() {
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 57f99d477413..27560bb9a734 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,5 +4,5 @@ DIST polkit-0.117.tar.gz 1554536 BLAKE2B 1cf7e0ff9db19a29be626f4bea96c9e2ef8b1ea
 DIST polkit-0.118.tar.gz 1556765 BLAKE2B d048b37b1ff8ad59a2d8a333a3b459d1592b61f7a6d9a9569f8b2984de913d71abfc9748e242c7453f0bce4f322bd44672e35309f181afd22488794ca0e47119 SHA512 3d412f40c903cfaf68530f9c0cb616106f8edf43bec6805de129f8bb9cb4e64c98da6bf02caa3ef5619974f3e2df7a70564f08b92901662453477e9005752b4e
 EBUILD polkit-0.116-r1.ebuild 3300 BLAKE2B 8595ffd0e47b4086d2b7b417bf11ae0eeae9c7b555a25daf0add7070e16e638374d36f6c9b77847ffd67692e53c1fd04d9b29c2b10edd7fb53aaa785ffb465f5 SHA512 bf8d37f0c463f19e611025249c4f8faace23b0e0f65de749e084c96c80924278eb2597a58d73e769cba6d0af403ab46f1087f8163c244195d5ec2c8fbef27cbb
 EBUILD polkit-0.117.ebuild 3304 BLAKE2B c700ee70fa5d9b8b38fdb1a274be12152f451ef5d0c389b5a0038cc2f5423bf058506549e81db655474bd3775b5c35967ca0b6d3231cfa512c41bb132ed20c1a SHA512 4ab89d50a29ef939907955958be3e894473d5f6ab020d297485532d741d018e003d871de849639d4d1e3de18405c78f52d091f295468405b56c2b522a5958415
-EBUILD polkit-0.118.ebuild 3271 BLAKE2B 6477dc4fa08115fa6733312e5582eea4d7a6f2194e803bbba39399a8cae55eae5a39dcdcf4e1dddd13f3cc8739cd3ee214d43262e1ea1542e071fa9beea91e7c SHA512 cdaa9ba85dd58bc2bf18a8ad82a1c3aef2595e693f6f920c45cfc72ecf84b8c8dbce7bc847bde9b612061d573ead94e7aca1f3ea998197cd5b301ea1393f049c
+EBUILD polkit-0.118.ebuild 3278 BLAKE2B e7d8cb19f9730520a30558e574f78707fdccec5d96ed5da8e5d1734e9880feff565899ab1ae08dd51fd1cf038ce7a68b1fb5edcfd75fba360ac38789f2680d6b SHA512 e86a01fe64656d722367d17e8d15dab41e626e185b8c5a97198849b2fcb2ffb82c38eb9089e822bb6b2e8b639bec9e21cd58129168a9081c7dbfce475bc49f0c
 MISC metadata.xml 409 BLAKE2B 5460681a61f218f9347ddaaf9f4171aba5d270d9742588e9c2d9f78d4ba495a811062098ae65ce866ce6c5177adaf6b943db33739214ccaecc2a5e3914c67809 SHA512 e5a26398bdbc9251d175235e40477f20b814753e16565e6ca4f56a7d2f7b22c7238fcadd07519eecef7dee3428bd5b76b377ff19b24b7be5b0f52d4cfff32743
diff --git a/sys-auth/polkit/polkit-0.118.ebuild b/sys-auth/polkit/polkit-0.118.ebuild
index d6c8489322df..e04bbab4c847 100644
--- a/sys-auth/polkit/polkit-0.118.ebuild
+++ b/sys-auth/polkit/polkit-0.118.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
 IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index f13e3537fe97..b18cf544ffbe 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,4 +1,4 @@
 DIST skey-1.1.5-patches-6.tar.xz 34108 BLAKE2B 410dbe673e0a32a4c3fd0610f898057e7b3afcc0d0fd124683033790f9c518bf89486f13e8d87825c0959ff34e91eae82df6ba3b79c1dcb99a34d5657036d5a6 SHA512 2c807675cdd6b800f03427d79d616f59ac9d4d438221913328ec92e5dd13af185f74a24e17d36af8d49a51c4ecc5b24ef198489acce416d829e8aacf5d3c208a
 DIST skey-1.1.5.tar.bz2 61911 BLAKE2B 6226a91f4018bee5796bf60339dc8554324a044eef18a69ea176d060cb4af90779cafaee58f42ad7a6e433b94da8de6e5e4d1ee9362904966fd0872d5ac3ccce SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37
-EBUILD skey-1.1.5-r11.ebuild 1992 BLAKE2B 2b5c8b9bc100380957b7f7afa0ab6c7c851ce0ab5f8e01643ee07bb1de76d2ecfbd64b571b4d20105d194537589fc2769b94d96fac5c1aeb5c779a7cc8cc1931 SHA512 62d7082c5f8ca162d7e3ec302397c6d5b0be61b9760796497d108fb3e1610e69ca0814913faa872d6f33e108c7a95fb554de4b6e4834d03e148887993d205734
+EBUILD skey-1.1.5-r11.ebuild 2002 BLAKE2B 356a583eeab5736fd38e1b1dcd80636ce03bc8f6a65ceec819641580a3b9ebd888cfc161216f36862e63eb477e1b74bb160d272ed60ed5b2e89d07598287392a SHA512 7f91073530de394c2224fb1cbac82194ad603430a8788a5c9e5100bdfb612edaf12a030780f0ab81beca5603a254165285ed13cea6ce5efe47f30dce8658b217
 MISC metadata.xml 1432 BLAKE2B efd6ff43e309d55d511d6bf4527a8565df2da6815bafb9079d465be95f128b9f17eb8019dd58a1230c41cb75eda4eba412231ec7028e9d67a05b18e33d78827b SHA512 8fe776255ff049ae9c16ee0ff157761114ca4fcc777d103e707557ef5f18fba9d65e63a77f24219e27d267cd76839abf128210969dc4330d66920a2ee574aabf
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index 5fac943577f3..835cde8edc67 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -21,7 +21,7 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Time-Local
 	sys-libs/cracklib"
 
-PATCHES="../patch"
+PATCHES=("${WORKDIR}/patch")
 
 src_configure() {
 	tc-export CC
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index 6e18290d4219..8bb3473aca0e 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,5 +1,5 @@
 DIST solo-python-0.0.27.tar.gz 35657 BLAKE2B 747d8849ad4bdda7c0e4b079dce2d7162f07dad4784bb941242dd8ea759cccd763537cec2c7cd9ecf6f467c771729217648b72aa36292622f5fc3adb8a0c280c SHA512 50d564916e07a0c65a843bd2d0328a735ba71eadcfc893b13fac84a3e51822ed2bf80fc3f7662943a5635c6cd6b3ded8ba5b5a9ac2282c9f9bcdfe9de191e445
 DIST solo-python-0.0.30.tar.gz 34932 BLAKE2B 6787d9c6e102cd2cb5579be0cb3ffbbe76b3ae90f4fa6891b6a1ca3e76436568a949daa6796fc17c9868d10d5de3b0dd377619936eccb0d436a284a35efa40a9 SHA512 bba63e598ef585ef49e98f3ec2a79911cf8af3fc38c9407bd91b7500dc55bf84f365664e6f80ff0ed3553ce93f5d61ba11c5301e8b36d6000c7a922857adaa5e
 EBUILD solo-python-0.0.27.ebuild 1176 BLAKE2B d1d247c95a6ae62b1f8f1964f303592a2ea7639c48aaa80d6e31d3bfbcb2d3b161ad7856cc93413601ed86d65a962dcdd0a03ddb374b745ef08b047c4f9ddef0 SHA512 f642a785bb585855c0cf93de1a96b5ff129784629215dbea706acc0c21aa98d55255bfd6fbe0126b4eaa64668e28aaec7f0da5478413743c66f56e055d31fbb6
-EBUILD solo-python-0.0.30.ebuild 1134 BLAKE2B 9b6d0d85669bd07860cb9871072ed08e2d60d6253878d12a84705cb5675517df6fbe438dab427367816e45d05e4dd4400de56cf62e2a099dd1fecfc846b2508d SHA512 d0c64b6357fa0b44b54019dc74f7405d4a845a298c009ee9999c192d238ee60b44ea5cb1ff0392e7baa1f9d367ba428e9585775513f25ab75a76f221511a9538
-MISC metadata.xml 667 BLAKE2B 7ca73329d8c7713c4c96848d6c5fc23bec99cd45e42266236fe2c5e7d70023bd8d5647da307f0e362863b38393fb9d66c2bb8965763eac3bdf7d5f30a357c7a0 SHA512 ec1899ba5d2082758c79a2abda4e834fbe31358c900507d02801b2a04ea8d37ca2d420a974e16fc8813ffc4f92488f8db5a0d998600c6d28191942592004d031
+EBUILD solo-python-0.0.30.ebuild 1134 BLAKE2B 1e703ee0c685f70d9b1ab0382d6d7a5e7049298628973e40c7dd63f3fbc8ab5654c11538fcf5cb9cec3424f65368c0418812ebaf9995d5451f53f94006649638 SHA512 d1b429c6f7eada8d5198742c2af4a0e0b5960934a30c2c67cd28b75812849926a4752700e467a0dd8f1679315207319293cf7b194e265921cf3a1fcb6c8be681
+MISC metadata.xml 691 BLAKE2B 56d4a4830788efd1222f1e3a9e456b01d43c876856f8ad5063ea9a2a75363fcd66cccc9100af139aadb63b68741493ed89e398c5a38d7a41b676bae187cde15c SHA512 0814323a9067bdfca6730146c21e0c46243eae7b3f68603de5bb3f455f57e47743ea5bce602a897b3f37f27c8981c281d49e04c279295cea74b207d6c0e65945
diff --git a/sys-auth/solo-python/metadata.xml b/sys-auth/solo-python/metadata.xml
index 9014b8d50308..66650766e42c 100644
--- a/sys-auth/solo-python/metadata.xml
+++ b/sys-auth/solo-python/metadata.xml
@@ -10,6 +10,7 @@
 		set/change the PIN, generate credentials, interact with the on-board TRNG, update
 		the firmware, and more. See the output of 'solo key --help' for more information.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">solokeys/solo-python</remote-id>
 		<remote-id type="pypi">solo</remote-id>
diff --git a/sys-auth/solo-python/solo-python-0.0.30.ebuild b/sys-auth/solo-python/solo-python-0.0.30.ebuild
index a0767f1bb325..9c5f1048ec41 100644
--- a/sys-auth/solo-python/solo-python-0.0.30.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
@@ -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"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]