gentoo resync : 22.01.2021

21 files changed, 421 insertions, 32 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 1405f43f20b4..9e54af98215d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 5dccb89f82af..298b93de03a9 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -2,9 +2,10 @@ AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91
 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
 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-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472
-DIST elogind-246.9.1.tar.gz 1534991 BLAKE2B 3360b5a2504156ea3c3b965f11db305bc1a7cb761bd4c2ca73a00005dbb62db37dec35d07f7939917bac61e0573a9b6224eb094853001c4d522b0c8bfde54a13 SHA512 b409568630ac20c1e984d9389237533e67ce4ad0fe0e0d47ad3fd943e579971412bcbdb922f2929bc5e9f26198647d3436beadbde0bfed4ae730107611a69e48
+DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
 EBUILD elogind-243.7-r1.ebuild 4133 BLAKE2B 50218c57ea3a2f8ac9d3a24702ea9cf4b116caec19af85bf2b6966cc73d0f9046b5608e53c30e2534134f317adce0646db7a2d499357d8c6321bcad8e3367c9d SHA512 adef0c04b80c8cd91317ecb26c18d8690237e50f68cb91e1edcaf762fb6182841a0b2a9e6e53f7bb70367537935e89f5e849b21586fcab2e700b4c2179c8a2fd
 EBUILD elogind-243.7.ebuild 4055 BLAKE2B 1eee3558814325ccd0f107bafc3eee1facbf7d15eb901073f9d38e25ec1669c1fa8b95c7a2a0e552eec41d96f0da332d6e2d01c0a31a20af8e1aa6d8cd91545d SHA512 182abf35ceccc60bcbbc31534b590b6a7c871a2142efc21ca1d0013f651952502e7d15b43c0f8f9c7e5d37db9cb0307867b19e36ccf49cce9a718ec5753c2315
-EBUILD elogind-246.9.1.ebuild 4140 BLAKE2B 71fa6124df423d6c737bc0818b3ddf998289c4eece8ff01d7c93c3db1df0a903516de97d76c54e70d3e344ea76e5f26e030f03262892a9e6167a351fe50408a4 SHA512 b4552a6a8bbfebe0ea400cb118582f50ecaa2e6abb30b036eb9823cedb9122b2fb1dd599d8de6a45f27549a16e32b4d4c61129437d460fd80462583586291038
+EBUILD elogind-246.9.2.ebuild 4143 BLAKE2B 23ec1b60f22a737310fd0d7586054691df49b135baefc6fba8a8bc31410233b7709c17d9a81ef2bccc8b3b0da58bf161b86cb867e839f1656c13ce12bde42c87 SHA512 81d3cc1a890ddadf99a9a39cfa1a599d3936931e804a56aec1eb7c4b66bb282cc94f9d3cc6882a64dffa79e4e6f8a72afa38524e3ab5fdf75f51cc51446ce18f
 MISC metadata.xml 492 BLAKE2B 5a8b55fb5fd3c98d72f0f003e69275d50a511c2cfa8b8c15c3e06c105b96ad19515e0144c9cffe5e6a86002656a2101ab811c6b9178ece9b050a32f65fd9ebd2 SHA512 220bde659ec75567f5d78eca23fa7e03f49a829cb1c08abe66be3d22ae2d7dd7ba2f177fdb33642a2b0ffc125abe7547d6a77153e88de9bb62d7009a898e8969
diff --git a/sys-auth/elogind/elogind-246.9.1.ebuild b/sys-auth/elogind/elogind-246.9.2.ebuild
index afcc828ef599..79d70653448e 100644
--- a/sys-auth/elogind/elogind-246.9.1.ebuild
+++ b/sys-auth/elogind/elogind-246.9.2.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
@@ -106,7 +106,7 @@ src_install() {
 
 	meson_src_install
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
 
 	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
 	newconfd ${PN}.conf ${PN}
diff --git a/sys-auth/elogind/files/elogind.init-r1 b/sys-auth/elogind/files/elogind.init-r1
new file mode 100644
index 000000000000..1cb5071c621e
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.init-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need dbus
+
+	# Make sure elogind is up before xdm starts any dm
+	before xdm
+
+	use logger
+}
+
+start() {
+	ebegin "Starting elogind"
+
+	start-stop-daemon --start --quiet \
+		--pidfile "${ELOGIND_PIDFILE}" \
+		--exec "${ELOGIND_EXEC}" -- --daemon
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping elogind"
+	start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
+	eend $?
+}
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 981ccf25478e..09f239828dda 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,4 +1,9 @@
+AUX fprintd-0.8.1-fno-common.patch 1053 BLAKE2B a1cec2d6317ac0bffd131bf305c5ad0b2d69f8bf84e2de78dd5c2b04e2ae7f939243009cb38dc2c618568f1aa33eea0a53dc0ef93a96e998a90e4b6c5fdf3150 SHA512 4a762befbceda0bc35b576a1af42c7d49c7add5eb4f76eb0ec31d7ddb0f96e0a70591e64437d2a61fff8e9d903839340d31719c354753e7af01dbb3e585081bc
+AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAKE2B 838b56e110fdf670816fb59e7ad30b908c54b8ee1cbbe4fda0334ac068265c8cdcb7e48200796b0872718099dea918554641dc02670e32e5f9369f7cc05fb95b SHA512 553e6baa7d1a90971627e3e1303488734596f83fea4413d2a4ce2688f003cded95182b652622f758f4e347b54a1294837a2014a9e36badc25e8b254947a54736
+AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
+DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 EBUILD fprintd-0.8.1-r2.ebuild 1467 BLAKE2B 09c611813121532bb15a25e849d64d4e7eca38e8c2dcd5909877532b104151c0ce8301ff902636c206b03e4ce474d023208de46b899f1039acc990e793e98dfd SHA512 7e5ca0b4a0971497a47bc35cdc0e4f0db8c63d174398059832fc21d164ada79687f49ae11238ae7ed30d4d8f50f4e219891e3ab809657bd6320bfc63bae0aad5
-EBUILD fprintd-0.8.1-r3.ebuild 1622 BLAKE2B 2257a40fa51990c0827fa9e1e92c27a9edf1380c4812477ced953fb4480b17a76c8a17c9e005d0472323c10ebe528cb321b0c862ff263c34e2df61db8b40ddc4 SHA512 965200858f04546035f3f9d5e14e24125945acc2d371905acd953d915e8b12e4015ca268b15b2f99a779f5ee7bf6e414344cfa5615272408b25d551fa66c6dae
-MISC metadata.xml 344 BLAKE2B 9a02f1005090b51c476c6705fe5627cf66dfdc3c4168e917b47651510b0596a6582bb2e4bc09bdd943c202a49a9e3d9bf58a03badeb1bd45f017b6bfef236fe9 SHA512 93369d8bd0b3f7c65b2f6a49f9e35b438879ffdd5c4b4906a4f3e09b0ce74dad1bb6f204c58be724edb88cb4e6a0380e28f516bd1c3bdcd904b8b9e8955dbd8d
+EBUILD fprintd-0.8.1-r3.ebuild 1640 BLAKE2B fd057037d273e14209e62466c39d2fe1f37a1a2908ae812963e58a8f2de10de0144016a568be8821576b25b282bfa6665bed7fd8827da98918f9cfce3f7813da SHA512 bb4d283d9d384808f79dc5a47591d2925948872116629e1779e5174f584fe8415ff7170b43fb2b719d0e2cf1adb7c8c5f6404567c1661a87e2cea17f5971c765
+EBUILD fprintd-1.90.8.ebuild 1604 BLAKE2B 445c13a35b6aad523d30dd2c51f2714ac452afc274f3d30373249923bcdd207423c4fc58af81b98b10312b571fb61af28224a5ac9c90db54ef6ebb08bc1f1414 SHA512 2cd1acd1e9a02e4bc4e4a9c836b2cb845affa688819bb95b7afbbd0355668fdf9d750c9c574b36575765db71bbb5c2efe5e0e9bfdd6da491204aafce8820b47f
+MISC metadata.xml 265 BLAKE2B 9c8a5ab87f06a4bb41749d77607017b51bd9a8a11167b44243fe3239fdd810b39d874abb0bc37d24977a59d6c1c0e9a447c3d18f5da2b4cd0feba10ccb14f048 SHA512 13396b6bc6de9ca04d98c0e94bd71b2f0b5b73238c21fac6f9fa3db9f5ab20efca035e84ae625b34a67bcc3c4f69acff1b57df96a28766ad59b6bbd65c8cb1b7
diff --git a/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch b/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch
new file mode 100644
index 000000000000..ba4574fce60d
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/src/device.c
++++ b/src/device.c
+@@ -47,6 +47,7 @@ static char *fingers[] = {
+ 	"right-little-finger"
+ };
+ 
++extern struct storage store;
+ extern DBusGConnection *fprintd_dbus_conn;
+ 
+ static void fprint_device_claim(FprintDevice *rdev,
+--- a/src/file_storage.c
++++ b/src/file_storage.c
+@@ -44,6 +44,7 @@
+ #define FP_FINGER_IS_VALID(finger) \
+ 	((finger) >= LEFT_THUMB && (finger) <= RIGHT_LITTLE)
+ 
++extern struct storage store;
+ static char *get_path_to_storedir(uint16_t driver_id, uint32_t devtype, char *base_store)
+ {
+ 	char idstr[5];
+--- a/src/main.c
++++ b/src/main.c
+@@ -34,6 +34,7 @@
+ #include "storage.h"
+ #include "file_storage.h"
+ 
++struct storage store;
+ extern DBusGConnection *fprintd_dbus_conn;
+ static gboolean no_timeout = FALSE;
+ static gboolean g_fatal_warnings = FALSE;
+--- a/src/storage.h
++++ b/src/storage.h
+@@ -41,10 +41,7 @@ struct storage {
+ 	storage_discover_prints discover_prints;
+ };
+ 
+-typedef struct storage fp_storage;
+-
+-/* The currently setup store */
+-fp_storage store;
++extern struct storage store;
+ 
+ #endif
+ 
diff --git a/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch b/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch
new file mode 100644
index 000000000000..95428184c2f5
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch
@@ -0,0 +1,75 @@
+From 7820465f078e9655af70036d8c570fd644b38f22 Mon Sep 17 00:00:00 2001
+From: Martin Gysel <me@bearsh.org>
+Date: Thu, 19 Nov 2020 07:04:10 +0100
+Subject: [PATCH 1/2] add test feature and make tests optional
+
+---
+ meson.build       | 14 ++++++++++----
+ meson_options.txt |  4 ++++
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 66aa2f7..ba44788 100644
+--- a/meson.build
++++ b/meson.build
+@@ -125,7 +125,7 @@ endif
+ polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
+ 
+ # Tests dependencies
+-pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
++pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam') and get_option('test').enabled() )
+ 
+ xmllint = find_program('xmllint', required: false)
+ python3 = find_program('python3') # No meson without it!
+@@ -139,11 +139,13 @@ python3_test_modules = {
+ }
+ python3_available_modules = []
+ 
++if get_option('test').enabled()
+ foreach module, required : python3_test_modules
+     if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
+         error('Python3 module \'' + module + '\' required by test suite not found')
+     endif
+ endforeach
++endif
+ 
+ cdata = configuration_data()
+ cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+@@ -167,7 +169,9 @@ endif
+ if get_option('gtk_doc')
+     subdir('doc')
+ endif
+-subdir('tests')
++if get_option('test').enabled()
++    subdir('tests')
++endif
+ subdir('po')
+ 
+ output = []
+@@ -189,7 +193,9 @@ output += '  PAM module: ' + pam_dep.found().to_string()
+ output += '  Manuals: ' + get_option('man').to_string()
+ output += '  GTK Doc: ' + get_option('gtk_doc').to_string()
+ output += '  XML Linter ' + xmllint.found().to_string()
+-output += '\nTest setup:\n'
+-output += '  With address sanitizer: ' + address_sanitizer.to_string()
++if get_option('test').enabled()
++    output += '\nTest setup:\n'
++    output += '  With address sanitizer: ' + address_sanitizer.to_string()
++endif
+ 
+ message('\n'+'\n'.join(output)+'\n')
+diff --git a/meson_options.txt b/meson_options.txt
+index be31fe1..92c01cd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -19,3 +19,7 @@ option('gtk_doc',
+     type: 'boolean',
+     value: false,
+     description: 'Use gtk-doc to build documentation')
++option('test',
++    type: 'feature',
++    value: 'disabled',
++    description: 'Enable tests')
+-- 
+2.29.2
+
diff --git a/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch b/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch
new file mode 100644
index 000000000000..a10026f33466
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch
@@ -0,0 +1,24 @@
+--- fprintd-v1.90.8/meson.build.orig	2020-12-13 08:08:13.886367478 +0100
++++ fprintd-v1.90.8/meson.build	2020-12-13 08:30:16.056756878 +0100
+@@ -84,7 +84,7 @@
+ libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
+ polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
+ dbus_dep = dependency('dbus-1', required: false)
+-libsystemd_dep = dependency('libsystemd', required: get_option('pam'))
++libsystemd_dep = dependency(get_option('libsystemd'), required: get_option('pam'))
+ pam_dep = cc.find_library('pam',
+     required: get_option('pam'),
+     has_headers: 'security/pam_modules.h',
+--- fprintd-v1.90.8/meson_options.txt.orig	2020-12-13 08:08:13.886367478 +0100
++++ fprintd-v1.90.8/meson_options.txt	2020-12-13 08:26:57.111919403 +0100
+@@ -10,6 +10,10 @@
+     description: 'Install system service files',
+     type: 'boolean',
+     value: true)
++option('libsystemd',
++    description: 'Libsystemd provider (libsystemd or libelogind)',
++    type: 'string',
++    value: 'libsystemd')
+ option('systemd_system_unit_dir',
+     description: 'Directory for systemd service files',
+     type: 'string')
diff --git a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
index 897c45965ff9..42c82b1510e9 100644
--- a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1-r3.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
@@ -13,25 +13,28 @@ SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc pam static-libs"
+IUSE="doc pam"
 
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-auth/libfprint:0
 	sys-auth/polkit
-	pam? ( sys-libs/pam )
-"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/dbus-glib
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )
-"
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
 
-S=${WORKDIR}/${MY_PV}
+S="${WORKDIR}"/${MY_PV}
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
@@ -42,8 +45,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable pam) \
-		$(use_enable static-libs static) \
 		$(use_enable doc gtk-doc-html) \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
@@ -54,7 +57,7 @@ src_install() {
 
 	keepdir /var/lib/fprint
 
-	find "${ED}" -type f -name "*.la" -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS NEWS README{,.transifex} TODO
 	newdoc pam/README README.pam_fprintd
diff --git a/sys-auth/fprintd/fprintd-1.90.8.ebuild b/sys-auth/fprintd/fprintd-1.90.8.ebuild
new file mode 100644
index 000000000000..1dcc64b3e959
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.90.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson pam systemd
+
+DESCRIPTION="D-Bus service to access fingerprint readers"
+HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc pam systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-auth/libfprint:2
+	sys-auth/polkit
+	pam? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( sys-auth/elogind )
+		sys-libs/pam
+	)
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-python/dbusmock
+		dev-python/dbus-python
+		dev-python/pycairo
+		pam? ( sys-libs/pam_wrapper )
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch"
+	"${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_configure() {
+		local emesonargs=(
+			$(meson_feature test)
+			$(meson_use pam)
+			-Dgtk_doc=$(usex doc true false)
+			-Dman=true
+			-Dsystemd_system_unit_dir=$(systemd_get_systemunitdir)
+			-Dpam_modules_dir=$(getpam_mod_dir)
+			-Dlibsystemd=$(usex systemd libsystemd libelogind)
+		)
+		meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dodoc AUTHORS NEWS README TODO
+	newdoc pam/README README.pam_fprintd
+}
+
+pkg_postinst() {
+	elog "Please take a look at README.pam_fprintd for integration docs."
+}
diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml
index 19586c3df843..91a72ded097f 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
 </upstream>
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 993484dbb50d..f92a512dd84c 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -9,4 +9,4 @@ EBUILD libfprint-1.0.ebuild 1070 BLAKE2B f4f6b88b3c239330242e1d0e2bdd8d26bc61ab5
 EBUILD libfprint-1.90.1-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
 EBUILD libfprint-1.90.2-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
 EBUILD libfprint-1.90.6.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
-MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
+MISC metadata.xml 270 BLAKE2B 58797f8d76cba5c33ebb79a73d05c267baeefe8f0518a57fcce10fb7e7adf9b8468023c23ecc221caba6ba341af44cc601fa0948ee2c09e12f75b7efaf6d1f7f SHA512 60ad5c829063b48625dd3eff410eeb50f712f174773bb120a6ad8626a4f0efcc21cb95fdcd4e8285d5b73decf66c6355cdcfa77b2ee777e8139d6e815732d38a
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index db0eade3bc14..45f10ca60cb7 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
 </upstream>
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 8bcfacb47f99..351b11959617 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -2,6 +2,8 @@ AUX pam_mount-2.16-crypto-Add-support-for-LUKS2.patch 1547 BLAKE2B f6c0ceba9ac68
 AUX pam_mount-2.16-remove-obsolete-openssl-api.patch 518 BLAKE2B 06dcaf0237e5e89549c1f1a6d6fef038785e9f170dc1065596b7ea2833a64d829ac762837cd0f1141db3f67571f4b43899ecc5b5e9a6ba093d9f55e8cdd7473f SHA512 362f44008810b4f9bd260cbbecba4f10b65bf7c98c77135eb5d365e91660d1fdd0c5dde65286f706c340b812e71f5f6cec85e8536263cce5e1c666068b27860c
 DIST pam_mount-2.16.tar.xz 312316 BLAKE2B 5954af8f8bf8b9cb47e1c07dc0d5fc5c4db099eeca5de90a3a53dc65aac0a2a6fba3f99c4d91d12f53b13abb5d3bae262b42536434553872a36ec108dc8d2c0c SHA512 3a579d7287cfcaef831d3e54d3e912407b65a966303e81c47f445d601f38f866ce04326e3d37a061f74f97b9cfb201e56109f57e55699d15d8f947ae2b91c8e3
 DIST pam_mount-2.17.tar.xz 326948 BLAKE2B b5d8c5701bfa4e3ce50ca71b1130d5f68655df12ac45cf554f38f2625b33fcece895d4b67d79cea2ad735c4994c779844dfc5266872e054a1e6d078632f3370c SHA512 d55d2a0e99d51ef649845548e4178b9b34db9c742c592e0ba97359646281af17795080e6ecb1a2a11bc680d31f2c77e69261f731de8f68e8602bcd838371927f
+DIST pam_mount-2.18.tar.xz 324524 BLAKE2B a3f29de8c0a348c98d3e73ac3568595083036fa704b5c34ed17c3660fcc8ff5f64195ad4158af6e351f79865a9128dbb773c7d18bbb07bdff1010e555803cfce SHA512 7f1e373fd7876eddd9226163602ba484ed8a7e1ce92ba6140c1f7603cb205190cb11ad75be41b54d2a6cd21602320d41a65714bfd0af8b5247850a3ef0fe3b22
 EBUILD pam_mount-2.16-r3.ebuild 1233 BLAKE2B cc7355b64c1770f7bbda48ad0bd3521da2e2513a1d57da02420ce4dbe64934f75e79d8bc9a81db85b25f93f06a424b868a8556b1820754ad4bd5d16910314c37 SHA512 2334795bd1742559f35d1b6ce1b75eac80fc0fad6ee036aad1cb9c54514e8162cd179b21de33373bfc30e124dff95492a7f0f36692622a69a0431569646d0df1
 EBUILD pam_mount-2.17.ebuild 1213 BLAKE2B a9045d907518c01aa6c045199cc809adbd03af4a085ef3aea45d6b981a16738c526b837e616f5d84c5a0b54b2271acd427c4ee0f5683891aabcfceef9e227457 SHA512 1c70e7416518be2c127ca6e2bfbded2c6e6101d270585fd684d1d7b6956c482524f9638503be76e1c23a0ce3479800f65e564c9b70edfa197f9f522ac61bb36b
-MISC metadata.xml 402 BLAKE2B 001c9702dee12640adcb05c6a6d9750e13ac0d45ebdb46859fc19e4071af76fcde847163f59b876992169968fefed8423352eec067ecf2ae6baa60dfdf412cc4 SHA512 546dd1bb071d1cc634250930b70328fc83f8bb4ac8a857fc3ccddadae5fcfb48d0a40adb0845e07535c63fd2dd2e6ef91779c0b48b6d147efa7aeb7fcde412e1
+EBUILD pam_mount-2.18.ebuild 1213 BLAKE2B bbf1ac9b070ed1df5012b06d102895b6ca13e07a5ca05234243cab5ba097104217b022ac955c806fb62acf7e27d7aabbed4f97269c47da0c1be1ba6a714b35e3 SHA512 92d3637bf71f7b2c055e08d6a90374210fcaddfa8a7ba70e21eff8e5142b368d917331d959383da29f11267ea27170ea19f093c098599b30e3c0c55095f5ae54
+MISC metadata.xml 295 BLAKE2B 3515a0d8915e500cf61f87db50404f07374926445aea2dfa57b893c52dd43789bb4a8bde7b02d89827eee82f96a4f433e722de9236abc25f0fe1737b6d523134 SHA512 09cb4472c36f63fe3cd9178004905d5070428aa9b5e83e271f802d9a41685ca61a562b1f130a8f1313cda3dce4de0fa4e2cc5187bd98ca94284d2de58d701e5d
diff --git a/sys-auth/pam_mount/metadata.xml b/sys-auth/pam_mount/metadata.xml
index c579fd57aaa2..59ad391ad196 100644
--- a/sys-auth/pam_mount/metadata.xml
+++ b/sys-auth/pam_mount/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>mattst88@gentoo.org</email>
-		<name>Matt Turner</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pam-mount</remote-id>
 	</upstream>
diff --git a/sys-auth/pam_mount/pam_mount-2.18.ebuild b/sys-auth/pam_mount/pam_mount-2.18.ebuild
new file mode 100644
index 000000000000..751fa5a24f4c
--- /dev/null
+++ b/sys-auth/pam_mount/pam_mount-2.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A PAM module that can mount volumes for a user session"
+HOMEPAGE="http://pam-mount.sourceforge.net"
+SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="crypt libressl ssl selinux"
+
+DEPEND="
+	>=sys-libs/pam-0.99
+	>=sys-libs/libhx-3.12.1:=
+	>=sys-apps/util-linux-2.20:=
+	>=dev-libs/libxml2-2.6:=
+	>=dev-libs/libpcre-7:=
+	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/pam_mount-2.16-remove-obsolete-openssl-api.patch
+)
+
+src_configure() {
+	econf --with-slibdir="/$(get_libdir)" \
+			$(use_with crypt cryptsetup) \
+			$(use_with ssl crypto) \
+			$(use_with selinux)
+}
+
+src_install() {
+	default
+	use selinux || rm -r "${D}"/etc/selinux
+	dodoc doc/*.txt
+
+	# Remove unused nonstandard run-dir, current version uses
+	# FHS-compatible /run, but has leftover mkdir from old version
+	rm -r "${D}/var/lib"
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index ed75252492b4..8384b8c9004a 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,3 +1,5 @@
 DIST solo-python-0.0.26.tar.gz 35251 BLAKE2B 76e515667220a8efdd16e159008eed8232721e0a8a1a1bffbc773cfa832b2f112d8dc229bf69dc4ccbee1d11b41d630a2d91e2383ebd19158d8c46ccf4f355de SHA512 f97da4a4ed3b0e0f4715407b179d8a8c1385076611fe8669cec6b514313d38dd14c6c22434b73e2c72f7456407a6c942b26b72cca7a56969cfbc630ee25aad85
-EBUILD solo-python-0.0.26.ebuild 1134 BLAKE2B 5f3c95b9e520cd4e913f775f1cf266d064cd1f3a5cbc971610449fa6c416c40b7b7b4e37a2e646d65b2de8a9d774277ed3f2b6baf06d1e0a7fe239f2683c0cb8 SHA512 7dc20e360858194051ddf3781ceb731f51d02b6203fd2e7c779a4d3790a9d65ba1d4a8d1470cd1e8a832d9043aaa642b06c112e156f6a5fb00ee24921de77e03
+DIST solo-python-0.0.27.tar.gz 35657 BLAKE2B 747d8849ad4bdda7c0e4b079dce2d7162f07dad4784bb941242dd8ea759cccd763537cec2c7cd9ecf6f467c771729217648b72aa36292622f5fc3adb8a0c280c SHA512 50d564916e07a0c65a843bd2d0328a735ba71eadcfc893b13fac84a3e51822ed2bf80fc3f7662943a5635c6cd6b3ded8ba5b5a9ac2282c9f9bcdfe9de191e445
+EBUILD solo-python-0.0.26.ebuild 1133 BLAKE2B bfe44a9ace058b7cae1592afdb3724246529c4795d2f4e6b1adb0e8a479c6768203ca4537b2e4d8f28829ba1213ebb16c334b23875eed2b41da040077db771eb SHA512 a154b8616f47fb03c1b5432be0a3b31f491ffd9ff23967f0616717558d159f1176077d96e5e149300a7004572ee30406319c66af89fc1b6057ba6f960db1218e
+EBUILD solo-python-0.0.27.ebuild 1134 BLAKE2B 85b5a2b965d6f1a2833259dabb9ea3c3544fa51b4cae81cd1774ced9a6453e3af3a6dc6df5a72c0ca5dd511728a445794795f6cdd658315bdc20ea6969730086 SHA512 4064559b4ca71b9d3c3068125cab35cb1ac15f78be1ad32e29d291cb6c80a0446b13c1a7a2270613cbf5c9d53c39dfd21b10a96a02778038e43e175488b79997
 MISC metadata.xml 667 BLAKE2B 7ca73329d8c7713c4c96848d6c5fc23bec99cd45e42266236fe2c5e7d70023bd8d5647da307f0e362863b38393fb9d66c2bb8965763eac3bdf7d5f30a357c7a0 SHA512 ec1899ba5d2082758c79a2abda4e834fbe31358c900507d02801b2a04ea8d37ca2d420a974e16fc8813ffc4f92488f8db5a0d998600c6d28191942592004d031
diff --git a/sys-auth/solo-python/solo-python-0.0.26.ebuild b/sys-auth/solo-python/solo-python-0.0.26.ebuild
index df378e83b42f..e818982ae301 100644
--- a/sys-auth/solo-python/solo-python-0.0.26.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.26.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
@@ -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.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/sys-auth/solo-python/solo-python-0.0.27.ebuild b/sys-auth/solo-python/solo-python-0.0.27.ebuild
new file mode 100644
index 000000000000..29ea8a9393ae
--- /dev/null
+++ b/sys-auth/solo-python/solo-python-0.0.27.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+
+RDEPEND=">=dev-python/click-7.0.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	>=dev-python/fido2-0.8.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/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index bc2eb314ccba..494a03f7978f 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -3,5 +3,7 @@ AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb79
 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.1.1.tar.gz 1302573 BLAKE2B da4419b7074930f7d264f21a12973511d350e687d0487b93d25a528f4a79d5df44dbbdde34ef7cd0d14507ba1a00f776fcd7eaf503f2253d8ee8da3e9a68010f SHA512 14d880088f7624f600c6badb6504c4c71ef29ff82e9c29bd837013e62273c6b198ca581705cc7fb9f3c0c13334767ea7b340fb033ce99fb60fb0478281affc9f
+DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
 EBUILD yubico-piv-tool-2.1.1-r2.ebuild 1299 BLAKE2B 7de823f32fadb2fbd5a2e4d54045aad3e6cc57f5080859dad40b5097a137aeeae803ddd5066a7c74ff1537cb3a215f68c9559a63ef7488937d4436e8ac6b6017 SHA512 23e1c093dad527fc434678cb6cacfeb4bd1f0c94efd24e8e1a1ed45c19c1ed5d12a3d8847473f1109136377acef25898375a7df5615e4b6181c28c490892aec3
+EBUILD yubico-piv-tool-2.2.0.ebuild 1277 BLAKE2B 318c6dda1adb207d3e123fbd0f0b40e33495651b7759e314c6a78bd4ee925a81a3241cf278e3d58574c6ab4e3832b73ee802bbea320837fd13b9f3a3f541dd7d SHA512 f0b7289f7e3312c01881a0e6d0f4bfdca8fd21c0f50332ed004efe4b509b73ddf34633f7647a895b9b31ae60e33620533769a5667d1f037fa28cdc69d67e9a88
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
new file mode 100644
index 000000000000..986733af196b
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# 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"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/openssl: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
+}