gentoo resync : 05.12.2021

34 files changed, 478 insertions, 248 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 1d9414293a97..e12edafdf431 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index aa7b486488b0..e92607fd8c65 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,9 +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-clang-undefined-symbol.patch 1090 BLAKE2B aaad5048696084e0a010c9a6716a91af686d76199e4e7e83d7857c02f782e18e2c7c8a716677372dda115d19b54290db55c62a5c32deb3553d0341495aa73937 SHA512 6766eb5d34135cd581d50f8a9eabda4826731368234522d1c5a94775d54f4d90b1195348ad7a0f6f2af0e2460a9d359859072c57c41085b92707f7044ab46956
 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
 EBUILD elogind-246.10-r1.ebuild 4193 BLAKE2B c3c674fea3b7e95441e2f63147e39e377330fb9f056191c88a51bb2f9e5f8684346f9b5d7c8d8b85cdbfb973da244ea46d6dcb7fd380e39d5e0e6d102fa7c502 SHA512 3a4c0bef8cc0499dd91a90702e0fc500be615cf96c4045988b5c21b7f45e7a0acfcf7208699cc88084052db84d2c9bd10271b0864ae91ac2e0a10a7485799ec8
-MISC metadata.xml 493 BLAKE2B ecd187b0cc697e9974a22456f2e7d3f40e5c329ada96c02c8c75aba1af65ea4e83d50783271cc2a85a174a13aad7291966d6faea1eb93b4d3df843ea4af6779e SHA512 65985689723cb8511731e6da2a7c66df8920a4c5e6d9471d9de646a0a9c2044783ac46bff956a8e7257d2ad2293ce5fe30d05b30ab8e2bd058d580a7ff0b4338
+EBUILD elogind-246.10-r2.ebuild 4085 BLAKE2B aac35092f8f84e251a5a353dea6aafa0acbf2cc667a3940497f6db0a08f56ab195ad94128e2ef3f061553bf7dadf81a82ab2fa0b32de8ed7aef090aec9fe0543 SHA512 c38b109cf0a74730b90a9d25efed0a96a6652e7e859aeb642333c4933ea95af0f1755fc8525d6f73edf49dee36d17df13b8015d34a8ec4e790d93be1176d9db0
+MISC metadata.xml 611 BLAKE2B fe45cf6b7f90d50e5518e3566371572983373853b8255d7b3824a4a3e71c1dec675f6ab7e490bc0c5e8cbee135b5005455aa69404493111dc3b2d855035a87e3 SHA512 52dcfb08f9d44c4420d949e7caed21a1166077f5475e976cba4f65dd2c7225df4294e21ff5bb7736c18efbe7e56913e33680c26c1fa51d17bbe1ab155ac058e1
diff --git a/sys-auth/elogind/elogind-246.10-r2.ebuild b/sys-auth/elogind/elogind-246.10-r2.ebuild
new file mode 100644
index 000000000000..e571a7a18750
--- /dev/null
+++ b/sys-auth/elogind/elogind-246.10-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v241-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	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"
+fi
+
+inherit linux-info meson pam udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+IUSE="+acl audit +cgroup-hybrid debug doc +pam +policykit selinux"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	dev-util/intltool
+	virtual/pkgconfig
+"
+DEPEND="
+	audit? ( sys-process/audit )
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+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"
+	"${FILESDIR}/${P}-clang-undefined-symbol.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	use kernel_linux && linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	if use cgroup-hybrid; then
+		cgroupmode="hybrid"
+	else
+		cgroupmode="unified"
+	fi
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dpamlibdir=$(getpam_mod_dir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		-Drootlibdir="${EPREFIX}"/$(get_libdir)
+		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
+		-Drootprefix="${EPREFIX}/"
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl true false)
+		-Daudit=$(usex audit true false)
+		--buildtype $(usex debug debug release)
+		-Dhtml=$(usex doc auto false)
+		-Dpam=$(usex pam true false)
+		-Dselinux=$(usex selinux true false)
+		-Dutmp=$(usex elibc_musl false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+	meson_src_install
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+
+	sed -e "s|@libdir@|$(get_libdir)|" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
+		ewarn "In other words, it will be useless for most applications."
+		ewarn
+	fi
+	if ! use policykit; then
+		ewarn "loginctl will not be able to perform privileged operations without"
+		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
+		ewarn
+	fi
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+		elog "elogind is currently started from boot runlevel."
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		elog "elogind is currently not started from any runlevel."
+		elog "You may add it to the boot runlevel by:"
+		elog "# rc-update add elogind boot"
+		elog
+		elog "Alternatively, you can leave elogind out of any"
+		elog "runlevel. It will then be started automatically"
+		if use pam; then
+			elog "when the first service calls it via dbus, or"
+			elog "the first user logs into the system."
+		else
+			elog "when the first service calls it via dbus."
+		fi
+	fi
+}
diff --git a/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch b/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
new file mode 100644
index 000000000000..3a157615884e
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
@@ -0,0 +1,20 @@
+--- a/src/libelogind/sd-bus/bus-error.h
++++ b/src/libelogind/sd-bus/bus-error.h
+@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis
+  * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
+  * least once per compilation unit (i.e. per library), to ensure that
+  * the error map is really added to the final binary.
++ *
++ * In addition, set the retain attribute so that the section cannot be
++ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
++ * warn for the unknown attribute, so just disable -Wattributes.
+  */
+ 
+ #define BUS_ERROR_MAP_ELF_REGISTER                                      \
++        _Pragma("GCC diagnostic ignored \"-Wattributes\"")              \
+         _section_("SYSTEMD_BUS_ERROR_MAP")                              \
+         _used_                                                          \
++        __attribute__((retain))                                         \
+         _alignptr_                                                      \
+         _variable_no_sanitize_address_
+
diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 160c728b5cf8..858ca09dddce 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -11,6 +11,9 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<use>
+		<flag name="cgroup-hybrid">Use hybrid cgroup hierarchy (OpenRC's default) instead of unified.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">elogind/elogind</remote-id>
 	</upstream>
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index bba4e45f4705..43d5f3b1a056 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 2149 BLAKE2B 1b142bbc560150ca42e49d8d59f72d0e770da462d7a0fdc19d4b3a5739ba17bc55c4477dce6ec44a526f22113f8930bfed2281952ca9b1fe0c732c3e45bb0311 SHA512 e7793f65cf2a2b6259fc2962ba189911bef82a1f1308d7f9b1345216591ec04ea3c1353cfce16959c1ce5202ee9cd0e53a5dd7ad1e3d020244c4aef0a6df8875
+EBUILD fprintd-1.94.0.ebuild 2152 BLAKE2B e6bf424b4ac955e3b016c5ae1ef212b09980c265c3567f9bd35dfdfeaf0b9f04f2f69e8e70d1d5357a94383f561f5bf5ba29204a7d9b213d04cdbf43a4c9fcf3 SHA512 4ad3c9916295e5c2f78ad13f42db52e14411f523ed3d066f740a551fba6a6dadef17d4fb1fd8d305a02870075129bd0bf7ad9a9f61e8f0d831276c313233a602
 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 88fac27dac57..2c889e47e04f 100644
--- a/sys-auth/fprintd/fprintd-1.94.0.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index ddcc0c4e8dec..ac7c9118fcad 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,4 +1,5 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
+AUX libfprint-1.94.1-test-timeout.patch 537 BLAKE2B 5010eac973ade5c5cf48e50355da33f83042c8f7a7d9bc2d88533cc0aa746aec33f0977442e79ff11a58682104d73c5d0dedb0c31564cf9def9af2c73abc2fd6 SHA512 a9d87b681e92be2a81a42d2a68642d4be8479da11b22b5dfd145b21a08ea863f3bc73557259f3c4592128f7000ccb26c6530aa84aebc49303ee0cd3d4aa81147
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.90.7.tar.gz 6375722 BLAKE2B d0cb085c3846e870ff31dc346b8e138ab994f03e428aa1887066e56243d10179f3674538841edc75e02c8b58fc9a2ea1e97999fa919bad033aa52c88742948fd SHA512 2781ebb337cbd37affe203a7d054651abc7de4f2f450cddfb78a29e4f93e6a698dd950cc9be7112f43c5a892309e75b11e46cdcb60359859aae3811468adc8af
 DIST libfprint-1.92.0.tar.gz 8434928 BLAKE2B eba5d103a7ffc1d297bc276baac1f55dcc308bc18a4507fa53552044eb1a57bdb04cab0d81ee1b4022b5407f3cea06f72a686eac1b1cc5b178258b33e81b9216 SHA512 5f802aa65525bbe1c057053f9752052fe8f4e614ec22d373339cba42396a4e7ffe9cbdf7a7b732729e9aac7a4cde42fb5156949e83c574a30c0ad7b23ae4bc38
@@ -6,5 +7,5 @@ DIST libfprint-1.94.1.tar.gz 10405046 BLAKE2B a46af62d3f7f8ad7f0815cecbd2a8c68c2
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
 EBUILD libfprint-1.90.7.ebuild 1248 BLAKE2B c8f159d22cf23171dc0ee53fdc21b5069e833edcd6b4d24771529e1238ce886b8c523714bb844ff424b16b17144f2bb3692ef4400981b825b05ff0dfa5c77b29 SHA512 dc1b7483cd7a1d7bd4bb491c44728aa3b04d44500e1753e5525823e8718809257d9b95275c9380f85db914a9cda75e00bf1a372d3a989916aeeb4adbd3c4ba04
 EBUILD libfprint-1.92.0-r1.ebuild 1269 BLAKE2B 68807fb616967bfeb73e41968af6e08619aeadfa3db600312b6925682d5405c65c17348264a243e99ddd9adbcce68fd0b427907c37c743008da344fe749fe5c0 SHA512 a819eab0a606236a1268324c63f9c9511c9d60070aec3a94c69860609bf563029dc3b1c33ec3fb1ae8564d4e0d0d66d038577ee905c271bfe0c386ed89f4126d
-EBUILD libfprint-1.94.1-r1.ebuild 1259 BLAKE2B 4e018a915a5424f39d2c469f440fa2c00cab7cb55cd5389760fcc98ec7106313456deeca726cd78b8423a24c154e996fe8d020f704d6ceee5f50a347df8a6042 SHA512 fe7d4d63ab8407ba47e2d68113b9747cf6d704262ea6778f33e8999c7b98c6c2bdfb9d3b435a2299a51ca3e74deeafb96ea1f7f4f8e76c98a4c80931ffadfcbb
+EBUILD libfprint-1.94.1-r1.ebuild 1314 BLAKE2B eda292f8de8f4835be566653c8eacb32599abcf015d14488893cce7ec3d8bb3ff5c5771b118d5432aecedb1fcee45e5e7de6b133ce572b2f1dfde2f5c18c2b22 SHA512 3c9c762d5dec532cb0a380a6f2d64f2eac4a6895ff17abd7121ea59810328fd7bfa5b85d540a244b0192774b534793158d83c0da7e5af5491a4fc96d32b032bb
 MISC metadata.xml 275 BLAKE2B 20edfbe69300bfaf17dcd8e55ed6576d69e44c4e41a27a6211eb613b1bef6e97b0ccca036d9a55ff318faa6ff0679fa387d115109935a4e144fa3dc9c0aaf847 SHA512 9d3975cfeeb4e4e3101c291081d5da73124002d03f016f8ac79931cbba20d3c28d7a08769b4c845cd8d8a2d9be537b68f429fe3691136f851b01bb8b5233f406
diff --git a/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch b/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch
new file mode 100644
index 000000000000..cc5080e2a140
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch
@@ -0,0 +1,15 @@
+Although most libfprint tests are vert quick, several of the VirtualImage
+ones come very close to the default time-out threshold of 30 seconds.
+Increase the relevant threshold to 45 seconds to make those tests less
+sensitive to CPU frequency, system load etc.
+
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -88,6 +88,7 @@
+                     suite: ut_suite,
+                     depends: libfprint_typelib,
+                     env: envs,
++                    timeout: 45,
+                 )
+             endforeach
+         else
diff --git a/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild b/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
index 3b98a35777fd..306f7e0104f2 100644
--- a/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="examples gtk-doc +introspection"
 
 RDEPEND="
@@ -35,7 +35,10 @@ BDEPEND="
 	introspection? ( dev-libs/gobject-introspection )
 "
 
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch
+	"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
+)
 
 src_configure() {
 	local emesonargs=(
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 4f7320659cbe..a15c34268fb4 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -9,5 +9,7 @@ AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a
 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
+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
 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
new file mode 100644
index 000000000000..945fc4c4e681
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos +pam pynslcd sasl test +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEP="
+	acct-group/nslcd
+	acct-user/nslcd
+	net-nds/openldap[${MULTILIB_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	sys-libs/pam[${MULTILIB_USEDEP}]
+	utils? ( ${PYTHON_DEPS} )
+	pynslcd? (
+		dev-python/python-ldap[${PYTHON_USEDEP}]
+		dev-python/python-daemon[${PYTHON_USEDEP}]
+	)
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap
+"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/automake
+"
+
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} pynslcd )
+"
+
+PATCHES=(
+	"${FILESDIR}/nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch"
+	"${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() {
+	default
+	use utils && python_setup
+	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
+	mv pynslcd/pynslcd.py pynslcd/main.py || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-utils
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
+		$(use_enable pynslcd)
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)
+	)
+
+	# nss libraries always go in /lib on Gentoo
+	if multilib_is_native_abi ; then
+		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
+		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
+	else
+		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
+		myconf+=("--libdir=/$(get_libdir)")
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ln -s ../pynslcd/constants.py utils/constants.py || die
+	python_foreach_impl python_test
+	popd >/dev/null || die
+}
+
+python_test() {
+	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() {
+	local script
+
+	newinitd "${FILESDIR}"/nslcd.init nslcd
+	s6_install_service nslcd "${FILESDIR}"/nslcd.s6
+
+	insinto /usr/share/nss-pam-ldapd
+	doins "${WORKDIR}/${P}/nslcd.conf"
+
+	fperms o-r /etc/nslcd.conf
+
+	if use utils; then
+		python_moduleinto nslcd
+		python_foreach_impl python_domodule utils/*.py
+
+		for script in chsh getent; do
+			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
+		done
+	fi
+	if use pynslcd; then
+		rm -rf "${D}"/usr/share/pynslcd
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+		python_scriptinto /usr/sbin
+		python_foreach_impl python_newscript pynslcd/main.py pynslcd
+		newinitd "${FILESDIR}"/pynslcd.init pynslcd
+	fi
+
+	newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
+	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use pynslcd; then
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process nslcd.conf
+
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	echo
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
+	elog "to supervise this service."
+	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
+	elog "default runlevel instead of nslcd."
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+	echo
+}
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index dc02634c5770..1f91a86a5421 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,5 +1,5 @@
 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 906 BLAKE2B 53d245a3c03134532f494ded97227fc70e0b80fd2729af94fda6313c0efcc7a9601468b352b98f17f92e9af1a3072fd4eb4703c855ffbb488ae94ede3761108b SHA512 8eaebbe6696406caf9cba2e16d391182968c2530cf2085d04968181c8130986574832e184b28ceaeaee3a86bb54d8244f7c97dafb789b9742a2e585a5578aab4
+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.2-r1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
index 6390e33505a8..c9270b893144 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/pam-MySQL-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="openssl"
 
 DEPEND="
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 780aefb3ebbf..911685c5f819 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,4 @@
 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 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
-MISC metadata.xml 3935 BLAKE2B a98a7660a9a61a40eb072592748d277dc86a19be494f5e0bcdd17c6de736eba374de477394f15148381c351523a29110836086d31f5d0b2195b9755f6e55f1ea SHA512 ce6aa3cdc1f2a3238340af20209d827044b878927f8afeda3ead2982313407a72a5b8270665c34b01480483a5be5917a51bcf8351415f0d72adad9d949b01306
+EBUILD pambase-999999999.ebuild 2941 BLAKE2B 8cdd1697869dd1e1ade3db363b981631c97b7e9978165a172c20c0c04e968157dcfc76807307959b7639e22a530072868e733f0ccc1a2b16497a641318efe403 SHA512 16186f1385141d853daa0c7bada3021d9495f88d5d43ab11347ced115789e4daeecdbf57c599c16e21463c11102946ee022f3849a0ebf24ff2ce24f0d4e6f2ab
+MISC metadata.xml 4061 BLAKE2B c877f6450ccfc91a3f3ee1bf10301cf21913f66a6d5f32f6698ea852006094243432a2fbc635821532355841ec074aa1ea426a745254f62e2e595d8049b3b75a SHA512 4c46b27df8f3b31c8f9474cf2b01c46014a3374c508f65970deb16476fbcf5710855322eb61d7fa65ac44a1fba60a2a223a26e890da3fed50102964f97306767
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 2373f12897e3..f2c911a6f82d 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -68,6 +68,9 @@
 			will not be compatible with systems using an earlier glibc
 			version.
 		</flag>
+		<flag name="yescrypt">
+			Switch Linux-PAM's pam_unix module to use yescrypt for passwords hashes rather than MD5
+		</flag>
 		<flag name="pam_krb5">
 			Enable pam_krb5 module on system auth stack, as an alternative
 			to pam_unix. If Kerberos authentication succeed, only pam_unix
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index b4166689528b..e0387fbc8c5a 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -21,13 +21,14 @@ 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"
+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 )
@@ -52,6 +53,7 @@ RDEPEND="
 	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 '
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index 32261a38566e..24c9afcd1c43 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,9 +1,5 @@
 DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800
-DIST passwdqc-2.0.0.tar.gz 86235 BLAKE2B fa67007ca0477feafd8743eda0899b7e348bf75e00e7ff23b6acdf56a456d75bec89a4b7dead41d7889610669425ff0145d6e7c94db0ce93219de0c5c0b80909 SHA512 7e5c0a32361d604c47ad02f36beff3287f638f2911b398a21b89cea164bf9a161b3bc252e9c660eaa53c5e5fce458d1cb1fd6b2bb308bafdb729c9d7e67f5295
-DIST passwdqc-2.0.1.tar.gz 87804 BLAKE2B 0fbbe4dbb68104fb94dbb0a3a84759d2ad5ec3e8fb285a12534b0465e5c3ed4084e879f9322dbd26071338f4e39b01b3e42337e933bee921600e3a32f00069b8 SHA512 95d10099634dd15d2e93249b37e1d2727922fdeac9993ddb63b6c3f8ff39377c02fce0e0a77d120aed868d3a2cb51972eed4cf84f5ddcec8488f60e9769d4263
 DIST passwdqc-2.0.2.tar.gz 88796 BLAKE2B 4be0180dbee38d124cc5fd3780fcc27b276bd9370c59c83a9c037b67f18518873bd34d23f779125ac0b5e8bb1f40a5e8e24dc65bfe5919f735f96d4f625cebdb SHA512 60f91ad7c86314b0d9ad97a2474a1a5bbb8b41491b274e09f7300d8a609cfffb0688bf39d4e715f647f3c87bfee429cb5e01f1a641a14eea3f55b223610ed8ec
 EBUILD passwdqc-1.4.0-r2.ebuild 1284 BLAKE2B a07c9d3faa8df29ac31fca0b43774fb5beca507d9ea5b5b7af64fd439acd7ec5ff83ae426e49603da061856993ebba0776f034332b830c0fbf478bf9427745ff SHA512 b80acc44dc913fc7f4ce3c7bd9a93a4764a7c5a35cfa79d35fdc0a43ba62e37e73888fa9350726f5d3d38ee77e677296d09b09aa02585f7821e60ffa6c05c892
-EBUILD passwdqc-2.0.0-r2.ebuild 1301 BLAKE2B 44a1aa38b18b2cf38d86a80a92003fa820d0c2f361adb9b3cd28a4fd396e84dff28f161c64e0387a5698c257b099a68ca1d78929be4715c453d52b7da5081549 SHA512 e0825dd943fd1942e6312f9e0da10563ced505b01ea685d9884c3347f1c3731534f9cfa1236f84cd726dff37d20bae66354953f338a6b6579cd58115c0fccced
-EBUILD passwdqc-2.0.1-r2.ebuild 1301 BLAKE2B 44a1aa38b18b2cf38d86a80a92003fa820d0c2f361adb9b3cd28a4fd396e84dff28f161c64e0387a5698c257b099a68ca1d78929be4715c453d52b7da5081549 SHA512 e0825dd943fd1942e6312f9e0da10563ced505b01ea685d9884c3347f1c3731534f9cfa1236f84cd726dff37d20bae66354953f338a6b6579cd58115c0fccced
 EBUILD passwdqc-2.0.2-r1.ebuild 1293 BLAKE2B abd166bff2f4cacc10e329367753c69a1370aca595061bbd601669969374973c9726bc358bc9862b271d82ec19f11eb350d77f01976c5f9c8370e125b06d542e SHA512 40e107db0828a002428be4259edf05096159e58c1b15f2259ae98c2cb3f35a8370218961a5ce20a22c3a88bf19e5cd93ac744d51d5cfcd8df0771d3b9c5a62c2
 MISC metadata.xml 323 BLAKE2B f55b8b04a5e10ef9cea74d99a187e72b477e27dd58cc734db4e70f662f74e28814a94d22f0cd7f982f83a90010ebf8047fde7bf45eb32fb290790ff6d080b67f SHA512 d7b828e47781ae5cc343d3dfd5734b63302cfdb4ad4112115f46c4985d97d22ffa3a28f06a3620e31ff844595acb411ff615fc9a7387180d3bddb49aa1c14d7f
diff --git a/sys-auth/passwdqc/passwdqc-2.0.0-r2.ebuild b/sys-auth/passwdqc/passwdqc-2.0.0-r2.ebuild
deleted file mode 100644
index d969c52fda64..000000000000
--- a/sys-auth/passwdqc/passwdqc-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-DESCRIPTION="Password strength checking library (and PAM module)"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-libs/pam
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	QA_FLAGS_IGNORED="/$(get_libdir)/security/pam_passwdqc.so
-		 /usr/$(get_libdir)/libpasswdqc.so.1"
-}
-
-src_prepare() {
-	default
-	sed -i -e 's:`uname -s`:Linux:' Makefile || die
-
-	# ship our own default settings
-	cat <<- EOF > "${S}/passwdqc.conf"
-		min=disabled,24,11,8,7
-		max=72
-		passphrase=3
-		match=4
-		similar=deny
-		random=47
-		enforce=everyone
-		retry=3
-	EOF
-
-}
-
-_emake() {
-	emake \
-		SHARED_LIBDIR="/usr/$(get_libdir)" \
-		SECUREDIR="$(getpam_mod_dir)" \
-		CONFDIR="/etc/security" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake all
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install_lib install_pam install_utils
-	dodoc README PLATFORMS INTERNALS
-}
diff --git a/sys-auth/passwdqc/passwdqc-2.0.1-r2.ebuild b/sys-auth/passwdqc/passwdqc-2.0.1-r2.ebuild
deleted file mode 100644
index d969c52fda64..000000000000
--- a/sys-auth/passwdqc/passwdqc-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-DESCRIPTION="Password strength checking library (and PAM module)"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-libs/pam
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	QA_FLAGS_IGNORED="/$(get_libdir)/security/pam_passwdqc.so
-		 /usr/$(get_libdir)/libpasswdqc.so.1"
-}
-
-src_prepare() {
-	default
-	sed -i -e 's:`uname -s`:Linux:' Makefile || die
-
-	# ship our own default settings
-	cat <<- EOF > "${S}/passwdqc.conf"
-		min=disabled,24,11,8,7
-		max=72
-		passphrase=3
-		match=4
-		similar=deny
-		random=47
-		enforce=everyone
-		retry=3
-	EOF
-
-}
-
-_emake() {
-	emake \
-		SHARED_LIBDIR="/usr/$(get_libdir)" \
-		SECUREDIR="$(getpam_mod_dir)" \
-		CONFDIR="/etc/security" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake all
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install_lib install_pam install_utils
-	dodoc README PLATFORMS INTERNALS
-}
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index f8752ff04592..e7e0e508bbfc 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,3 +1,5 @@
 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
-MISC metadata.xml 692 BLAKE2B ce28ac18e95a00f6d3821e8ce5a476fd82af30229d2fdb6f367662a10c6b022b297ea59fb168a8a62c18da3ed7947c76b23f5c95c73cc8785de6a07e56e4516b SHA512 7734e80461d2deb7bd440f7de41ebf9e86bdbdf49a29b23e59e4ebe3786cd683db6ac7159e9fc4eaabf6ff37cef01949c791911b4c3df1899c869e71c9e4323e
+EBUILD solo-python-0.0.31.ebuild 1142 BLAKE2B fd7f4cdd273b910a68637ecabc16dd08465c7d440926f96d4b5b4ec398bdd7ba61025a74c3f78bdd622333fb31f4bb4f8db080fdc19bb9eb1868dc325580eba1 SHA512 43d32ffdff81d0d31a67fb0ca5e78af834e1cb7996c0ccd42e12564958d4dab4511c61140588a3129c4ae931ea445d4e7f63240ce96ccbbe935a90b7b4b82830
+MISC metadata.xml 699 BLAKE2B 5f330f4e497c90f563c2171d6297c2c989885e93140d49e96f97d7cf560bcba67aa30b4de5345cbb9abf49e4ac41fad57985070421f736e28ea9dedbd2a00c76 SHA512 c10d907f43f3646c7f5ddb81aad69f294ad068d185abd9e81ee03fa6d0a8005af7e002a015d89dd2ce66065c46d032249670e059b4eeb38ff0c242449d98a509
diff --git a/sys-auth/solo-python/metadata.xml b/sys-auth/solo-python/metadata.xml
index 36357e473852..d5ab884af31c 100644
--- a/sys-auth/solo-python/metadata.xml
+++ b/sys-auth/solo-python/metadata.xml
@@ -13,6 +13,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">solokeys/solo-python</remote-id>
-		<remote-id type="pypi">solo</remote-id>
+		<remote-id type="pypi">solo-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/solo-python/solo-python-0.0.31.ebuild b/sys-auth/solo-python/solo-python-0.0.31.ebuild
new file mode 100644
index 000000000000..cdac36e7295b
--- /dev/null
+++ b/sys-auth/solo-python/solo-python-0.0.31.ebuild
@@ -0,0 +1,34 @@
+# 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/sssd/Manifest b/sys-auth/sssd/Manifest
index 6f4c8b5b7e5c..f0b0c629b36d 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,4 +1,5 @@
 AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
+AUX sssd-2.6.0-conditional-python-install.patch 418 BLAKE2B 47f3653982c551bc99d547daa998422a94fac132b3c6ce5a9db9ae64ef3d7426b3ded0426d969ad7eef27b942985404d413cc415332b0bd83acdf7f2c9adbad2 SHA512 12ba5a0adb8bc9227216e7f3ebe5805917d155b9064d13becdfb40555d416892c7d101f208bde75a87f4b70862f3dcdc242ee3f1593ebd452fcefba6c5b47a1c
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
 DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
 DIST sssd-2.5.2-CVE-2021-3621.patch.bz2 3155 BLAKE2B c50e331f0f1acbb9ef8e6d54a63219da44df5e565608c24635d85a110fcc024f7d5293c4412bca64831a9a3a14e2c1188be1a802c76575ad6d7a83243d3d89c2 SHA512 650af7c67b3a807935c0875ee877d366facdf818492fb4244757448ad351454a279968ea5414e6b3cd116e873abe4f1aef2ccdaf790a4df0cf7f2a0078a41860
@@ -6,5 +7,5 @@ DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd
 DIST sssd-2.6.0.tar.gz 7440969 BLAKE2B 6b05fcea09ef10a5b2f373dc6a66032edc4c4f46f65f42fdc9ffb5b676025095e16de4a86b3088351c22746e062829d1d68fa7e960cccb7c5a77d960e6d38e2a SHA512 0b9e169424cbadfa6132a3e5e9789facf82f04cce94cb5344b8ff49370ae8817c2cb16cf21caddf6a7cd42e661d5ff5bf97843d79681683aacff0053ff93f64b
 EBUILD sssd-2.3.1-r2.ebuild 7550 BLAKE2B bb7148a163aafe86d6efbcb29a48829ceed64ddbd328aa68e0d279478dcad70e77027647d4d38a9b56d317d76b024edfeb2d30656f50fd71414cecc25a1f91c9 SHA512 9ebb400f5bf139c18b04501c3b5ae4d74ce6dd4926f76f0b385d8f4b08d1e02b4f0d72cf7765bc30ddcfec50936954812b8522857d7c2b3d3859b12d6db9acb8
 EBUILD sssd-2.5.2-r2.ebuild 7903 BLAKE2B 74629995f904d268381aa14e689153a12957ac7864d2843924462da6cea8df00b40227c722e8a7127da516d95731ac2d39f54baba6a316bf65c3784345fc1fed SHA512 18aa0149a9ce1ab628f6d639e768eb5f73b778163fe613fb0a59e3cda196c3a6ed346543749447f29894884df271631e62c635c5d71f7853f149e4aae2c39704
-EBUILD sssd-2.6.0.ebuild 7492 BLAKE2B 9cfb5d7a96dc4e80872a35788fcb8f74866c92a36555a995a3ab9967924814b6923306b40abde5f33df77b555d941a17317aac742d3e4c6067d02e3496efa23c SHA512 9a2c72b4bea572dd7c28dd20aa21c2ece49a2fe51d6af41e994021ce22851263cabc18abe4bb5013f36a1c026b093c7cc76376f8361b9d55c055476e39a889fe
+EBUILD sssd-2.6.0-r1.ebuild 7564 BLAKE2B e862fff7812168422d58b2f78e9108dc1c437ff26724f2412ef2e2e2b44eaf90e3f61f3064adf606f319aab79cdc4eaebeccd501a68c2f0db81c20af48a93b5b SHA512 60abe45738b916f41960328c12a3bf83cece84af8b1ec576af05d7a660144486e2787ea74dc83b1d290973d7cff0a971ff6bf204f487c61eb51cc786083a26c5
 MISC metadata.xml 1182 BLAKE2B 8667ff4514a6cf81e044c53492760a20b4af07a345f75b48707587ce38903a5b5837e8aea5dec119a5f26cb0a5b7ce4577936cf6d4e666894bc5014ec6fd0c51 SHA512 e375a25d8dc8ccd1ec13e7b4bdf3782441b01ff15a0f0a213dbbb27ff9d30ff455e1efe1711096973b5c814dcb7f269af61cb455290b8948b06451e754b40912
diff --git a/sys-auth/sssd/files/sssd-2.6.0-conditional-python-install.patch b/sys-auth/sssd/files/sssd-2.6.0-conditional-python-install.patch
new file mode 100644
index 000000000000..04c18ceede8c
--- /dev/null
+++ b/sys-auth/sssd/files/sssd-2.6.0-conditional-python-install.patch
@@ -0,0 +1,19 @@
+--- a/src/tools/analyzer/Makefile.am
++++ b/src/tools/analyzer/Makefile.am
+@@ -1,5 +1,7 @@
+ pkgpythondir = $(python3dir)/sssd
++modulesdir = $(pkgpythondir)/modules
+ 
++if BUILD_PYTHON_BINDINGS
+ dist_pkgpython_SCRIPTS = \
+     sss_analyze.py \
+     $(NULL)
+@@ -10,7 +12,7 @@
+     source_reader.py \
+     $(NULL)
+ 
+-modulesdir = $(pkgpythondir)/modules
+ dist_modules_DATA = \
+     modules/request.py \
+     $(NULL)
++endif
diff --git a/sys-auth/sssd/sssd-2.6.0.ebuild b/sys-auth/sssd/sssd-2.6.0-r1.ebuild
index 857e7084b74f..6b13c0aa927a 100644
--- a/sys-auth/sssd/sssd-2.6.0.ebuild
+++ b/sys-auth/sssd/sssd-2.6.0-r1.ebuild
@@ -90,6 +90,8 @@ BDEPEND="
 
 CONFIG_CHECK="~KEYS"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.6.0-conditional-python-install.patch )
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ipa_hbac.h
 	/usr/include/sss_idmap.h
diff --git a/sys-auth/ykneo-ccid-tools/Manifest b/sys-auth/ykneo-ccid-tools/Manifest
deleted file mode 100644
index 7ca8bc17e988..000000000000
--- a/sys-auth/ykneo-ccid-tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ykneo-ccid-tools-0.0.0-string.patch 370 BLAKE2B b1daa18c8bb9d4d3109bb9e4c279b146d447f6ce25d64260ae3c486b111543cd84340e4e3434d90b8943b14b3a54609403b0026c43e509fa8437a5500788bf19 SHA512 208f63e0acbbcf88d67aba6c79e2b17b266d1450b3518e6043b6c3a56811282c70d30c27dcd00cc7190d61591e6ca53bffe15d54bc4d9152ce1f7a2ade9d076b
-DIST ykneo-ccid-tools-0.0.0.tar.gz 298831 BLAKE2B abe3cf35eab7afae56e16665735f8ce5aa436e8d1a7b98c7ac5f88a129ad2cb4331e40839c017b5384f442b0e365f7c0f414abe8dbcbbea5af08f13d8b3f5a54 SHA512 735fbdee9e307b8fa1304b5ebc1fc490807e3b4cd67b62c4faa100fe9ac2915b8c1c979820078e0035ddb9d304460c7bae601ad89f358101faae2f13d066d864
-EBUILD ykneo-ccid-tools-0.0.0.ebuild 553 BLAKE2B b45b93ae0faa27bf2cab191d7ad6ce47d0ceeb2898b2a62feadf85c7f9dadb4c9f89232709a4fb7b3bc22458ee42c193ea38434f87ef2e2053b65fc83946cf5a SHA512 3681a8d6cd626ec0ff0f08fbd5381140aa9337fafac05193bdc418259296cf4ef5c3e83cc17da9cb25eb5f190f6a3e94821e81b57cdcddac6756b37a5765f81c
-MISC metadata.xml 261 BLAKE2B 601ab70a808e95859b218eee967fa01d096de69dee7c67bef0ee3675fa2bb10774df91c7d9a599fb9e9e4bc0ec9966741546697b15013733bcb11d2ca6ef2db6 SHA512 c2a49cc0ecd4940fcfcf2de588e8ebd4bc01972c0bef6ec81adc01b5008953f714c214c1c9688f5696ef4fcb44898c4d51951782771bf00628ff0a97a8cf96ff
diff --git a/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch b/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch
deleted file mode 100644
index 7a4b70b82f82..000000000000
--- a/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN ykneo-ccid-tools-0.0.0.orig/NEO_Config.c ykneo-ccid-tools-0.0.0/NEO_Config.c
---- ykneo-ccid-tools-0.0.0.orig/NEO_Config.c	2012-12-20 21:30:44.000000000 +0100
-+++ ykneo-ccid-tools-0.0.0/NEO_Config.c	2013-08-12 16:40:18.109041000 +0200
-@@ -9,6 +9,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <neo_if.h>
- 
- #pragma pack(push, 1)
diff --git a/sys-auth/ykneo-ccid-tools/metadata.xml b/sys-auth/ykneo-ccid-tools/metadata.xml
deleted file mode 100644
index 29365b0cc2d3..000000000000
--- a/sys-auth/ykneo-ccid-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">Yubico/ykneo-ccid-tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild b/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
deleted file mode 100644
index ad5468406fe9..000000000000
--- a/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch udev
-
-DESCRIPTION="Tools for Yubico's YubiKey NEO in CCID mode"
-SRC_URI="http://yubico.github.io/ykneo-ccid-tools/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/ykneo-ccid-tools"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE=""
-
-RDEPEND="sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	dev-util/gengetopt"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-string.patch"
-}
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 6264b1c112b6..dffcace0c1f0 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,8 +1,7 @@
 AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb7950b2bf02bfe0048d9213e04aa60e9898a17cc4332bb8aa2fec273d341a99939cf209ef8fa70868d6beba836d2080e779681cdc SHA512 14c535a05cb597698bf230fafed11dcf4f2165f3daddb647f31848ad0505ee7a266bd2f6120fd2a57d4301fdf974c8af690a9e0eed51806517175082013701f4
 AUX yubico-piv-tool-2.1.1-tests-optional.patch 881 BLAKE2B 02821ac155a75a213567958d33e5f9b25838c1b1ea9dc65efda223ee397643d2d6479b5e5bd5867dfaf057d64bdebf1f1379d2187e4f9fbca1fb4fa97133d0fa SHA512 f694e2d9e882cdb04728a3fc1f857c9c5c388ed439d6efbb385fa96414c8241ce918f7a2bbbe0ac2c94fbf3b2981fc68de4c7a999822a14068c8f43bd21de43d
 AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6250536b89f01d1778a79bc8df823e896323053dac8fe23c6b23a84b526da61146204df3cbc7889cae3ffc9a0414626e6ddb3b0806051 SHA512 d48787ff5de1ed5ff80fbf2f65308ea0c174500e32b55033508284aa05b0674f013479aaed5697a8f1207f821e7fdbf99cc206830725c023aa3a349fa0792172
-DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
+AUX yubico-piv-tool-2.2.1-openssl3.patch 983 BLAKE2B 6ceffc2aa061e2d27bf0868e4ef48d25ae37b621098b53fd6f0ae3ae234cfcfc9705cb0633ace91d00b37d20d7d975a20870912eebf6bf38c6ccca8a895c8c81 SHA512 bb4495b0be964ddf6226b83ba04fbf0e8a7d27097a5636d809936dc27e388a7c8b4ef61d393be28ba1e440a1b6b198017cffc74cbda143953f714f6c72e65fde
 DIST yubico-piv-tool-2.2.1.tar.gz 1310253 BLAKE2B f5e5d2c351200b2fc57aafdd02a604ee5f15cd8f1a0cb552133a367da2cbf7fe248ec9eba649427b30e8322126be1f9677fd471b38db1f00cda37ccb0ac413c9 SHA512 495a269194d8d9d8957542611959b3fc8e0ae54d1cab5c041f2604590cc740e89e0956b9d595f8a06f138e92b8804def52aae797f199479a81fc1fc3d57bfb96
-EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1295 BLAKE2B 88a8abc80b294cc6de0f32fe53d479f94fbf8ef5425ece37131eefce64f0ea7fc0b9ac774c19e35c0dae1f49d28a865fbe3d29c64caf193d7ad1a65eddfbf929 SHA512 fe6340a8e4417337a637faf5d642f5f8a6402663b3bdd68d266b90d848bf649c7d480171ae6ec0acfff1c22a18aeae7dee44136f0b17af936bcb175edb1d044b
-EBUILD yubico-piv-tool-2.2.1.ebuild 1296 BLAKE2B 99b2735702317ba1262a25251ed457eefe9b59085941f8ad158403f7fdbb9f404c08f05a39656101008f6514b7be61e5090ef3d10d2d9c66d91d84c28918f349 SHA512 b8a6c451722e1705c30bfa2bd6dc1a4423c8cfc6689046d32ed6569fc2e3d3a020cfd5c2c1bec5d8fa51a66ac02d6d65b812e64bcff27bbf24b518caaffd733d
+EBUILD yubico-piv-tool-2.2.1.ebuild 1327 BLAKE2B a4e83bf27261b27c27ea61c7ee9e8cf3596d42be510277c7115e1c0b1167d91d801472e64221c605478da3870f006bafb2d252f1cbb509880e72398a72525455 SHA512 157573f9a400802dcfad3148e36b907131ccc5e2ad52f9811c993e474e0de7552db705c80fb7c0c3e05a9bd8c30e5f0a9d6c8d89cb6149d67c5e240fad15d278
 MISC metadata.xml 333 BLAKE2B 397e744e9f6f54b2204a1e843eef7a5bdb28b8c1adb52833e07ee67f31a22f4f4602c32bd1046c75597919df41eab48b48a6f8dcfdc4537280ee1d4371185a2c SHA512 a0bd364f2c2c41b1979d979deb9ee34eac43dfe1ed565cd787a39338512baf82760c8d1eb8e43f143af7f533e76bb0d0b10136c895ef09b1bb59aa3ff82e0544
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch
new file mode 100644
index 000000000000..5ba807ea0c6c
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch
@@ -0,0 +1,32 @@
+From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001
+From: Clemens Lang <cal@macports.org>
+Date: Sun, 14 Nov 2021 18:21:28 +0100
+Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3
+
+OpenSSL 3.x ships an openssl/types.h header that's protected with an
+OPENSSL_TYPES_H include guard macro. OpenSSL's headers fail to parse
+when ykcs11/openssl_types.h defines this symbol.
+
+Switch the include guard for the file to YKCS11_OPENSSL_TYPES_H to
+prevent this from happening.
+
+Signed-off-by: Clemens Lang <cal@macports.org>
+---
+ ykcs11/openssl_types.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
+index c526d815..f3e1a7c0 100644
+--- a/ykcs11/openssl_types.h
++++ b/ykcs11/openssl_types.h
+@@ -28,8 +28,8 @@
+  *
+  */
+ 
+-#ifndef OPENSSL_TYPES_H
+-#define OPENSSL_TYPES_H
++#ifndef YKCS11_OPENSSL_TYPES_H
++#define YKCS11_OPENSSL_TYPES_H
+ 
+ #include <openssl/bn.h>
+ #include <openssl/x509.h>
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
deleted file mode 100644
index 426295fd7d55..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~riscv"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	<dev-libs/openssl-2.99.99:0=[-bindist(-)]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
-	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-)
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	# As of 2.2.0, man pages end up in /usr/usr/... without the MANDIR override
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DCMAKE_INSTALL_MANDIR="share/man"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
-		|| die "Failed to generate p11-kit module configuration"
-	insinto /usr/share/p11-kit/modules
-	doins ${PN}.module
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
index 8cea2321eafe..c50d506fb8d8 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
@@ -11,13 +11,13 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/pcsc-lite
-	<dev-libs/openssl-2.99.99:0=[-bindist(-)]"
+	dev-libs/openssl:=[-bindist(-)]"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 BDEPEND="dev-util/gengetopt
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
 	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
 	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
+	"${FILESDIR}"/${PN}-2.2.1-openssl3.patch
 )
 
 S="${WORKDIR}/${PN}-${P}"