gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-auth
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
53 files changed, 388 insertions, 359 deletions
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.2.ebuild
index 1a14a298ba88..1a14a298ba88 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.2.ebuild
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index 7a75ec6f81e8..672f65851125 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,6 +1,6 @@
 DIST AusweisApp2-1.22.0.tar.gz 10845370 BLAKE2B 2b35bece49c96f7aca391a918539115351737b9cc6bcb913121f7f44db7ff88fb615bd3a3822d7d5670e83c81ac7c409fffb1696d6dd9310fdbd595c3f7fa88f SHA512 c2340625f4792afccde2f09d54e050efed0e78a7d921f545ec73f4bf23746b7b0c422fffbc87822abe2dc8b69a8439615f3d43179a98a64fa4165503c2e74079
-DIST AusweisApp2-1.22.1.tar.gz 10884409 BLAKE2B 3205bb4acd4145e20f336301c5a3dcb1da6d5fa1254169d0578d675dabb7b12fa84778b62a96ea4cae126800b4ef455b4e7a76154570090b8a74be41a1ba49b2 SHA512 3c66b401d370ae7f4ebb37a25c25d9eb044ec5706b85e656cb4a8ac0d3d6c922fe78f07a832635536f1e38896aad4aaf38ab4fd9bcdf00c9dac90e370b0f2232
+DIST AusweisApp2-1.22.2.tar.gz 10886670 BLAKE2B b3ab93549da146bb4108b4fa6981deb8e02c9f6143b8c5cf00f302999ded95e32db0a2180242b83558fbbe49101d385fc067b89554848de12872e6af3d82d4d2 SHA512 1ec777e2b4bef67fd7727ab21bfa2aeb5ad1e615b232fa8a3640fe3d6193a4f050f1824f421d9410d94c4e591fe46b48e1544701752724e4e300086f5cb9f27a
 EBUILD AusweisApp2-1.22.0.ebuild 930 BLAKE2B b78892ad8d3dd7cc0ddeff0b937b3d6e1d37b136d59105aa86e8382200ef1619ffe55e847eadcd45ae03c4912b73465ea3289f2068f3125a0d59b7f4e3e235cd SHA512 a31f9558facb799ea41b7c84bfe5c381f2ddda9fe0b670934aeee8e0b5bb62b1554f967ce036aa75d5128fa0c10f3297e4d8f0c325c75e5a7d3b73e4d27e3bbc
-EBUILD AusweisApp2-1.22.1.ebuild 932 BLAKE2B 2435436d607bfac5906776a0197280086ae48083adad73ad2ec3a7a1416501f438d69b71eff2254803c3ed66da3159c8a049bb9452f677172df48b817305abf1 SHA512 6c718752790fce8517b4254a2f41a4d40dfe380e350ad2d04da9b9e3c4521f59e40719e0467e76d0796e78e7d70d69b053c389120f9a6942e91475d33eda6681
+EBUILD AusweisApp2-1.22.2.ebuild 932 BLAKE2B 2435436d607bfac5906776a0197280086ae48083adad73ad2ec3a7a1416501f438d69b71eff2254803c3ed66da3159c8a049bb9452f677172df48b817305abf1 SHA512 6c718752790fce8517b4254a2f41a4d40dfe380e350ad2d04da9b9e3c4521f59e40719e0467e76d0796e78e7d70d69b053c389120f9a6942e91475d33eda6681
 EBUILD AusweisApp2-9999.ebuild 891 BLAKE2B 924618ee8a22a0ef8ad2ef62a0e8fc7448033f142371c32f814965275cb376d46e15822a9899031cc03a8003cd7159c1a94e8652a0eaf8c4acfa34eeeffa4e40 SHA512 83506e86320528f4ac17c6ac9aa80060aa9ecdf875817d12f0a680dffaf242495546aa0076c1f8185dc7eccf3dd00e87490e7ccf18028b14a57330f9f75a9894
 MISC metadata.xml 337 BLAKE2B 12190891c6b221b7c56938d103ea1bfbafd6541dcb08d10021d34b3581f521e11fa6555a638555bf03c7b1d708aae6f6a1de96d9b0bf300a1cd0bdec9a7595e6 SHA512 710cc4c1f20d1ac1090f944588fad306f06789ffaa938eb2e0961029542ddb35f766807bea3e9561228cff53eeb6eea884833c4579bfa4afabf65672c3091829
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index c7fc7a760a19..8d72f1d693ee 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
deleted file mode 100644
index 4c7e514d45b9..000000000000
--- a/sys-auth/authenticator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX authenticator-0.2.4-disable-failing-tests.patch 423 BLAKE2B 02ca693fec700649cc0103f3de458c04e711b42eb4c0207a3c8dfcb747c565bf0afe1e673e8cb689ee568a9c5440d706514c5ea758e8a596687e5b7df336c206 SHA512 6406f5cb916f49abf909dabdd7df2b0096b1b4b300c2e0b8c1097155c1c52e6b54ce9e7ef526829e8e07e00ca8c52a6b30944c65bce37893c91ffab9cb6cae19
-AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709f75b2d3cadddbb558938d8ef08d09b6d20f9008f513a44940f3b5847da784c52d382ab058ab91be084e98c1ba63ef450b41aa743a330b920e54cdec327a SHA512 0da21566e5913e99f78c6a7608a7b4a2da568c494dc7515d3d05993ddb8b611b607ef166d57be4ec949ca377848f474614d155068d2550ad6e7220ca46b5264a
-DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2
-EBUILD authenticator-0.2.4-r1.ebuild 1719 BLAKE2B 45863f14c3d7658e34fb9faf54f4c9c51460edf574360acf5a7abe38f21067f5e8a6cbdb1fd1b3bc38405edad27c563b20391df2711a61bad45d393bad201965 SHA512 9a3ea52af7c3961ce137583504e8a0c7062a9b5c169d0a0404510635224148cb83a56ca091f330806da09a589edbefd8f33bf4adf2bbca6a75178e9068440434
-EBUILD authenticator-9999.ebuild 1600 BLAKE2B 0f333dabdc968569d7f733080ffecbeaa5a890bf3bfceaa83e495179fe01d95256f8f9855f65771e096643a24612896d974ee1ae6ddd282700432965ce3e12f2 SHA512 e696f36a0c27ffaefbae60a6cf1983ae698dd4d2f8475ae608381e4e883967dbfd8b12e1932a483b5972692c8fb62203db359edc816ff427bea80107a331f18d
-MISC metadata.xml 330 BLAKE2B 3f95785e8c4c57564408244d2b4b6143bb685e431fd8fbde5e6f73e86525b10c27eb6affb70c3be2f4170d23d94a05db380647548d83a797a684daee25fb1731 SHA512 4fcb60bcb3d1e03c4368a3aa034706dad67a02b4b7158af8a8ca33bcf9eb34f36b5a7e39c5b6d9892135dd56110f42ad65a41499767ef4a60db6fb4a310eb21b
diff --git a/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
deleted file mode 100644
index c9af80e39d1f..000000000000
--- a/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
-else
-	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Authenticator-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/libsecret
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gd
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost )"
-PATCHES=(
-	"${FILESDIR}/${P}-disable-failing-tests.patch"
-	"${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
-
-	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
deleted file mode 100644
index cd26304aacfc..000000000000
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
-else
-	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Authenticator-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/libsecret
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gd
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost )"
-
-src_prepare() {
-	default
-
-	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
-
-	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
deleted file mode 100644
index 38b4b95464ad..000000000000
--- a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/data/meson.build b/data/meson.build
-index b646c11..884c5d0 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -50,10 +50,3 @@ endif
- 
- appstreamcli = find_program('appstream-util', required:false)
- 
--if appstreamcli.found()
--  test (
--    'Validate appdata file',
--    appstreamcli,
--    args: ['validate-relax', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
--  )
--endif
-
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
deleted file mode 100644
index ffbde3cf2f09..000000000000
--- a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/meson.build b/meson.build
-index ed9c48e..6b20bf0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -35,16 +35,7 @@ SERVICES_DIR = join_paths(get_option('datadir'), 'dbus-1', 'services')
- SEARCH_PROVIDER_DIR = join_paths(get_option('datadir'), 'gnome-shell', 'search-providers')
- LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
- 
--subproject('libgd',
--  default_options: [
--    'with-introspection=true',
--    'with-notification=true',
--    'static=false',
--    'pkgdatadir=' + DATA_DIR,
--    'pkglibdir=' + LIB_DIR
--  ]
--)
--
-+libgd_dep = dependency('gdlib', required : true)
- 
- 
- # Configuration params
-
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
deleted file mode 100644
index 110647d0e288..000000000000
--- a/sys-auth/authenticator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<name>Bilal Elmoussaoui</name>
-		</maintainer>
-		<bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 61d4c03b6a1a..618c029bacbb 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -3,6 +3,8 @@ AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
+DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
+EBUILD elogind-246.10.ebuild 4143 BLAKE2B 23ec1b60f22a737310fd0d7586054691df49b135baefc6fba8a8bc31410233b7709c17d9a81ef2bccc8b3b0da58bf161b86cb867e839f1656c13ce12bde42c87 SHA512 81d3cc1a890ddadf99a9a39cfa1a599d3936931e804a56aec1eb7c4b66bb282cc94f9d3cc6882a64dffa79e4e6f8a72afa38524e3ab5fdf75f51cc51446ce18f
 EBUILD elogind-246.9.2.ebuild 4136 BLAKE2B c02a85f4271d3fd3d0ef875d86e681cc0c1ed0e5d86b3c19399208d8e9826ae54e95a892d850c1ebda823b497cc3cba848eb689c67e637b548e27510c57124df SHA512 a7623ce84e631ee83c05373351f687bd7b962b56a73b9988c3c218b26a0fefea78948887c11ca5814001caaa15374aea7bea2b9a1cceacb539059ccc6593abdb
 MISC metadata.xml 492 BLAKE2B 825e86df619311ed9abf5f64f274f783fa9b3523d455c0608a16c3a39b58db0bc52099a3aceb3e2c7fddf28a292a75733cc7e5f8694f1d1b2006c702946a8d30 SHA512 d1af1f988c3211ac6520b02193e9e1b1c0d9dd204a567f8468516ebf4e4d8dc1fab56de0e0031bdd58a2f1336f1b1c8662ab9f56753948f1dd297a336ae40187
diff --git a/sys-auth/elogind/elogind-246.10.ebuild b/sys-auth/elogind/elogind-246.10.ebuild
new file mode 100644
index 000000000000..79d70653448e
--- /dev/null
+++ b/sys-auth/elogind/elogind-246.10.ebuild
@@ -0,0 +1,148 @@
+# 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 ~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 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
+)
+
+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() {
+	local rccgroupmode="$(grep rc_cgroup_mode ${EPREFIX}/etc/rc.conf | cut -d '"' -f 2)"
+	local cgroupmode="legacy"
+
+	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
+		cgroupmode="hybrid"
+	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
+		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/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 28472271515f..a1385d514c18 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -6,5 +6,5 @@ DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55d
 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
 EBUILD fprintd-1.90.8.ebuild 1609 BLAKE2B b740300da0690938cd618f1ed5a1380634e0bb041ed0b2634b1327b22a34c7ce5c763d9df1a980aad21cddc191c252258c2ad2128436cc20c2dc796042c87725 SHA512 9ca0ab30704e9b13be1e4569cc6f3e2a4d9047c07d52c0a292dc19287149052bc3dddf0b0f9ceb53f6698231a4b2764680dc9d08f6f38302d0dfee6eb3c371a2
-EBUILD fprintd-1.90.9.ebuild 1611 BLAKE2B a80960a38149b71ad8fe315293804d4c5c26173468f7d45aef781d619634b80b66b66fac05d9bded0edbe14ec788d228ba6c8f0fb8943cec9da6ebf10ad7fd59 SHA512 87f15ab1d74b026f1b028824c91a774e6b10f22a0364c63209c0efd07000a40d94c5b0d98595c066b79d42af660972d2150cf84a23fcb98a79807e3b8d18b791
+EBUILD fprintd-1.90.9.ebuild 1618 BLAKE2B a5767a33cb7faa2ed8b510a909ed91eefd84362ebd9c9b31501adb8703ab00fe8a86d1490a72146fa33b3dff5d20e01f7843202c9f88e33c6883d7a7eca22982 SHA512 48b4664618f7ef21e2dc99878989738972462fcc698a43e103a698b1a42374022f467d52408d004c734c5cb3e49d821316e52e7242cb1accabb082f54f9b2abe
 MISC metadata.xml 497 BLAKE2B 7fda00be12c7ce6dac7a00baea03d91414279033d86c10a233f00db2c876c224043c21f16c52922ac548c17861f381fa3989f9895bce41a0f34afa1d75e2e883 SHA512 29b70d7a55147573fbac8c6a40c8b5b82ebb5c6a6f2852f49d872eac9a44290b4d07e0ba1d754ae5e6656e00de05a47db6eae2dba5bb1fa2993115ff7d8aeded
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild
index 0dfa760969cd..d8be8e17fded 100644
--- a/sys-auth/fprintd/fprintd-1.90.9.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 32c8aedb7566..77c84dd4d37b 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,6 +1,8 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.90.6.tar.gz 6375191 BLAKE2B 0e6300da25eb910dc50c3752731f877ad26093bd901a8de222ec21965596fe88e643b0923edc4e100d96e3910595bb00c3935ef8b19840ac5c4ff1d9405f2d09 SHA512 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8
+DIST libfprint-1.90.7.tar.gz 6375722 BLAKE2B d0cb085c3846e870ff31dc346b8e138ab994f03e428aa1887066e56243d10179f3674538841edc75e02c8b58fc9a2ea1e97999fa919bad033aa52c88742948fd SHA512 2781ebb337cbd37affe203a7d054651abc7de4f2f450cddfb78a29e4f93e6a698dd950cc9be7112f43c5a892309e75b11e46cdcb60359859aae3811468adc8af
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
-EBUILD libfprint-1.90.6.ebuild 1234 BLAKE2B df9486eb3ce2fd2787275def20152821a7b23b7b3127f4cb4449b0b27e20def4f750bdd3dec8c42107a18c0827babfc93d4e44bdfd2723d49345cb56470f93b8 SHA512 7c595c9fba771a0ff862f6b44f0435054965af29880670b2d1e2d3400c3da31277418c5ac64444c515b6e1e55b831ee0134a5f31a42a7eb7293d0dfff5d5fb66
-MISC metadata.xml 270 BLAKE2B 58797f8d76cba5c33ebb79a73d05c267baeefe8f0518a57fcce10fb7e7adf9b8468023c23ecc221caba6ba341af44cc601fa0948ee2c09e12f75b7efaf6d1f7f SHA512 60ad5c829063b48625dd3eff410eeb50f712f174773bb120a6ad8626a4f0efcc21cb95fdcd4e8285d5b73decf66c6355cdcfa77b2ee777e8139d6e815732d38a
+EBUILD libfprint-1.90.6.ebuild 1233 BLAKE2B fe6ca6c080481351de8fcffeb81ea58e158d9233b03b31e5660ef9fea44dc134487d81492c5939f0b39d3476d8c19f8abef8e188e29e4c05001c327c07d8325a SHA512 ee88c8b1c6d3d2a19790d9964c7749197dc3180d346843a6f16bc87ec3b90b19821c89912ed49e121e34a19f720e3377801412c6fa46fcec3524ec262217101c
+EBUILD libfprint-1.90.7.ebuild 1247 BLAKE2B d6c868b8b3abd49a1b801c06c2b37520f0b6c388998ebff8d28e1159aa86856299df301eb1d317db4ce7d4f161389b0894086a87d93bb34f8734f27ea0447dd6 SHA512 1efe4c5fd1a8681a5d24ac84b40830d86cd88a33ded3fcf04736d0a576af357486218de51b2f6f06c01a17503d8bfd59ce37896680bd7e8a5cf9ba227db3eb16
+MISC metadata.xml 502 BLAKE2B 67f6489a608485b5f6d67aa8a86388d3fb66f1cc13420f366cdea2880beeebc8fc6b3b4923023b7c11fe6f4bf641d96a06ca7581102e07c73eaccfc922f72e40 SHA512 19c12450dbd790473b3d7c2004d2ce8cc985f86da2a007099c5f38abe546d89724a63f167fabacc9b49d6f5699cad5ef19442211a945b197d02cc4a98004f4f7
diff --git a/sys-auth/libfprint/libfprint-1.90.6.ebuild b/sys-auth/libfprint/libfprint-1.90.6.ebuild
index de51a02c5442..2b84a6e80819 100644
--- a/sys-auth/libfprint/libfprint-1.90.6.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/libfprint/libfprint-1.90.7.ebuild b/sys-auth/libfprint/libfprint-1.90.7.ebuild
new file mode 100644
index 000000000000..710c713a5b00
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.90.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="Library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples gtk-doc +introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgusb
+	dev-libs/nss
+	virtual/libusb:1=
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/pixman
+	!>=sys-auth/libfprint-1.90:0
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+src_configure() {
+		local emesonargs=(
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
+			$(meson_use gtk-doc doc)
+			-Ddrivers=all
+			-Dudev_rules=true
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index 45f10ca60cb7..0d5b92c82b4e 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-	<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index cf2f22de24f9..f1c64f3dc6f2 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -9,6 +9,6 @@ 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
-EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4166 BLAKE2B e59cd7f944bb20e41fdc51c8a6c873742c21e9df47f7c6f1e4170a720646318155576230b19ab54cc43ab4c4dd2c2efa1fa7d6d2ec50285e2e4dffc629f6ea6d SHA512 d89cd311f90603bedcb1726a570899a23746066f414019bb2cca8abf8e2543fee375505af42a9649baf0373c40f8bb38e4d1f6403048c248b9d6a85bea64899c
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4329 BLAKE2B 02e2a6dbbd6167cc29cc507fd1a117b9164442594a1944696db3fdb97143ab1b99a72ba42b777349c4c15518f87e721d4138119457254b38ea98f6638dac6948 SHA512 019a9497c49426782c971dd66fa3c064618c81fb5d6a2c010a3d6f755b8e4677bbe04622a939d79f3ad0635e56bfc4c5136a3ff2c3a6823950f3e9bcf9f0590b
+EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4159 BLAKE2B bc4e732144a72a94bf9f8b98db8410ebf7e67a06118cd79461dab556eaac56e4bb9da6a151e07f35e5d7e324ff27cfac428091721c8696efa89325f5d2154c65 SHA512 9108eff0d788cca661f8789e121f9cf9f9331f56db4d3cec094d8376ced0c7f8d9742d1e10b63d1c774f617354eef94d6adef3ba23c765cb7314b314454d0764
+EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4322 BLAKE2B ea22fb7707ad6d45aff2002aa4d72b9ec36a59864efc18fc172011ca10e02bff0ff1e2c76f65352c4507bd8ab7662a147ad768ec3c6e36244c4efdcb6406d268 SHA512 0e95df63aee69d7c9b0a8b82a924641f5afb2c35d6587313f06a4658f6b841832ac2b16110d3b424f2bc7c03a5340c114d49e1784e5bcfc365c84ee889f3798d
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
index f87a21058aaa..58c7e24d6301 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=(python3_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles
+inherit prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
index f2b7b143da30..3d6590078bca 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=(python3_{7..8})
-inherit eutils prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
+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/"
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 28e220d22236..16a507360b85 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -5,11 +5,12 @@ AUX nss_ldap-257.2-gssapi-headers.patch 2343 BLAKE2B d82b77be7a5f449e2367719262a
 AUX nss_ldap-264-disable-automagic.patch 4357 BLAKE2B 6ed58c1478d7aaeaa29002af980149c48b53ce7aa3fa2762194cd5b632ba16adea568023db019c8043c1bda6a82b6e1a13f63cffbf89b928003c1d74af4ad36d SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35
 AUX nss_ldap-265-fbsd.patch 13987 BLAKE2B c6a68bff90547ce503e8319639ae0ebc027ed9376e2d1d05ca5aa66e7e955e7025279aed0892860c8a75d6008a50f6863d512379171048b085589c6b0457630d SHA512 efb2e6c955b43743a06b7ddbda9bdf4c3a58f881a45f5d3166c87afd265399bc6da2014c17e3ef4b10a8a66532f38190fab8ddd3f970f155905372f09f6ff3e2
 AUX nss_ldap-265-installdir.patch 1626 BLAKE2B 733cb83d77595cc445f74ba0f9508a6fa32ee84f20f552fd06f1d936770d902ef3b7bfb0fc91ebd4e10ac159b4dcff314ab47165f4736802c027924a76c78322 SHA512 7e86ff4fff320ef8132fff6f317dc58641845327c4de9be3b0d41004d27dab41fcc8752987682cee0b8e22230ab1034f0cf45a84ec405706aa37d499bbcc70b8
+AUX nss_ldap-265-libdir.patch 1311 BLAKE2B 238efa51862e9399c1f0c98476085079542f4b742d95e7ea4afd1397845339183a398487d9c72595ecae1a789b63590d6461b2250a92c7d460cacd3267fdcbf9 SHA512 61bfd43b42ff62b6afa11f3c61195b8182b94646a986fe170381e717d4d1edd333b98814e6bade6c52b6c09111bc563ba13aa224e2437092306c1057e9c46bf6
 AUX nss_ldap-265-missing-entries-oneshot.patch 3734 BLAKE2B 8ecc35b20719222a747c511242ba826ce29adfbaf74d20883ede0b7b17aa712cf7ce05a23e9e9a9e6cf47a5098f728e43d666d2681a6df60076d60c4b1626957 SHA512 07136f98f5b195f4b794ede35d314db205b89e63168b14489964ad676714ecf861acdd5810fc99c2e784115af4e0e0a20f849672e7f6643dbb6e14db11c9cb05
 AUX nss_ldap-265-pthread.patch 18698 BLAKE2B 1a158ddca1dbc99536b2d637a938c6ab121bb217b6b4b6f9755139ea8aec860023ec5fdcdbcebd925b99d9d440fc4a06da364646cd30f6654e41cbedb18e74df SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d
 AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e53778c4581f5ce8f9f0b90ceaf7fdb3e08cdc029b3914d9f95a7b65f3f9ceedf6669ae5727d8bc41c7229c567667896b4cb8868b227 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b
 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0
 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
-EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B c1c0fe18519694473ec42f310e6f3e45ba4f3adcb511d57a60b2c4ca61218276eb33307828068f9ec837559a647c7ff71aedf9217674efde016738ec4bbaf469 SHA512 a505439d2138460a055c6d00db152937493dc1ebe96316be937065ebfbb25de6345979e5e184f572832347dc7656904d03faa5a8abbbf64bcf4ca3ea4e9d4ede
-EBUILD nss_ldap-265-r8.ebuild 3728 BLAKE2B 52967dd0d189451057c9dac58ce5cee507e90dd3b1501a835d73b3297f1d0f85dcd5f4786d9f6273cb0b280f640d22ce23bae6a20954059c23cbda7de7abc7b5 SHA512 59aeefcc414fb80abe3634b56c0f983f309415125f0e96c816f5c00cf14c595f57e66c028ebeae195edfe803cb1e32bd6e3959b06ddc155da70a8d2eeb51b1a5
+EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B 0bb870135f045e18d4e7cfd70b3c1577920efd6a7ec7b662fd6085e5084246a39bd6a0e8ed87a14d86df761f4b508a302a918814f01cb099c84aa43c3150e91f SHA512 c3187609058fb57f6e4270b322226fd2c8a10cebf206e98e0ce800f097d6ce8da7d1a9269a950bacdc247f20a1bcca1cfddc3b97b50240a4375009cbd62c0df0
+EBUILD nss_ldap-265-r9.ebuild 3758 BLAKE2B 691b51c82704357a51c5f8e6374661e25b38c3e8a3e654eef7db6f336024959cbde1c9e4fb22573422e35773c4bc5b02d2da270490beba8bcd30557c483203e1 SHA512 7cb1e5bfcaff91a3aca03c4a17584672ef016dc1978cde96e291b2e9f57f3fc3ea8208103d3bf9ecd8463c8c4bfb404a18f07a4472893b3824b16c3ba15c9f7b
 MISC metadata.xml 418 BLAKE2B 0ee38489c1ce6a94df354e507b4e89255abe13a587b6b8887eb234eb1463da037194ad6f3e834e9ce4c5ef6e00c3082706a4b602a2ad39b9ea3eafff71596b22 SHA512 0395ea328ffe10ee708706b9e524ef863716dcb4d762a05546a64c2dbde75ab1ff3ec853c6973e421e0d3a7c837df96adf502aacce726016c4302ab466e1e7a8
diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch
new file mode 100644
index 000000000000..d3609b604a23
--- /dev/null
+++ b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,17 +38,13 @@
+ DEFS = @DEFS@
+ #INCLUDES = -I$(top_builddir) -I$(srcdir)
+ 
+-if GCC
+-MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory)
+-else
+ MULTI_OS_DIRECTORY=.
+-endif
+ 
+ if GLIBC
+-LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|')
++LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|')
+ NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so
+ 
+-NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|')
++NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|')
+ NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS)
+ endif
+ 
+@@ -83,8 +79,6 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ 	(cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
+-	$(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+-	(cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
+ else
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ if HPUX
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index af476d7f04e1..ca216ce28544 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fixheadtails eutils multilib multilib-minimal autotools prefix
+inherit fixheadtails epatch multilib multilib-minimal autotools prefix
 
 IUSE="debug ssl sasl kerberos"
 
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild
index e6ed3ba6fc38..749cdb870cf0 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="debug kerberos ssl sasl"
+IUSE="debug kerberos ssl sasl split-usr"
 
 DEPEND="
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
@@ -32,7 +32,7 @@ src_prepare() {
 	# eprefixify is safe on non-Prefix systems, so go unconditional
 	# Note: comment this out or make it conditional on 'use prefix'
 	# if needs rebasing. Don't remove.
-	eapply "${FILESDIR}"/${P}-installdir.patch
+	eapply "${FILESDIR}"/${P}-libdir.patch
 	eprefixify Makefile.am
 
 	# bug 438692
@@ -121,8 +121,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# Dumb /usr/lib* -> /lib* symlinks gone wrong
-	rm -rf "${ED}"/usr/usr || die
+	use split-usr &&
+		dosym ../../$(get_libdir)/libnss_ldap.so.2 /usr/$(get_libdir)/libnss_ldap.so.2
 
 	insinto /etc
 	doins ldap.conf
@@ -138,7 +138,7 @@ multilib_src_install_all() {
 		CVSVersionInfo.txt README nsswitch.ldap certutil
 
 	docinto docs
-	dodoc doc/*
+	dodoc -r doc/.
 }
 
 pkg_postinst() {
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index c043e1a1e359..69231e9c4048 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1,5 +1,5 @@
 AUX oath-toolkit-2.6.2-gcc7.patch 3526 BLAKE2B 07966d96b4362cb7c271fa745cf9be843e14db9cade77768a9f31bbb0435c4f1f56c81464630871ad337213cbdc97ed0c1cf9ad9d261e29812984bab767c1eb1 SHA512 4bf9bc8e176861f044c55aab6c6cb48dcd7ac1d887f71f08475cc1e7f2b14cb04edc8417532613433af35687169667b073ea57556c85114e5a763a03443a85b9
 AUX oath-toolkit-2.6.2-glibc228.patch 4786 BLAKE2B 7690a2b5249b7c668be5a516fa0a298d789ac4d259a27ea3b5c9d5a581990ebc2431074f7e7adcc61c03ce2e0979cfbd2220c4335959c3f4f7279e758b954451 SHA512 4d015bc760b9df074441f93cd94342aff595b5ad5215165d64c0557222123b821c791a87afcba15a3ce0acfbe6945d96330468673249f4a2b1dc1700ab9040b2
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
-EBUILD oath-toolkit-2.6.2.ebuild 1829 BLAKE2B fb4739e1446beeb343e3394aabeb8ceed621c2eb196afab02db60acc5dd91efe9ffca9497245636cbec631a8d6b3b638f1a8092e8eef7e726b2cdc811db94830 SHA512 399297b6a23cf5e7dda7f76e6bae8c9067fbd2a92517fba408aee1aea276d4581204b18e1a141b90efd009901c1062c1273c9ae851109592e216417e8fc4e57a
+EBUILD oath-toolkit-2.6.2.ebuild 1822 BLAKE2B 62ee0b04ed2b876fc43b993750865ca7cdc296044316b2c8bd6c6d41a6f536558b4e5658c9f97805f852cd11cd0ba7e499ef33e03d23df111e23adae9cf75f87 SHA512 de19344a3ada7f361fd64cdc7fbf371598c3f3e3bc07d9da30e149a14abf661a248da9a4e24049ae36a32203f32273535f3bbb6fe017bceaa2dd1a091654a9e5
 MISC metadata.xml 560 BLAKE2B 946cac9a0134fb3291ad816283326746067411e000e98be05cd8f87dfa0455ef3558b1bdabcb537356fed867d8667850d929747592e7c79212c7ad3357434c84 SHA512 4d6506e02bb4a6f6069dfe357cc3e05c897699a067771baa995af823d4de587d2580b01bf1c2a38cb8f8f679ba0702498ad904b6bb1d685a2759c2b7752be7f2
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
index f92309af492c..fdbd65f35c85 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit pam eutils autotools
+inherit pam autotools
 DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
 HOMEPAGE="http://www.nongnu.org/oath-toolkit/"
 SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
diff --git a/sys-auth/pam_blue/Manifest b/sys-auth/pam_blue/Manifest
index c86409cf08d1..a6bf6c680427 100644
--- a/sys-auth/pam_blue/Manifest
+++ b/sys-auth/pam_blue/Manifest
@@ -1,5 +1,5 @@
 AUX pam_blue-0.9.0-bad-log.patch 357 BLAKE2B f7f6e4371642072ad5a0a9c645af5229167e36ffe2e242b5d0391ce169b59c8e7e083c54d4b02f711f6172737acb962d8f5b312fab1ac646cdf6ad7b8c1b87ad SHA512 cba81accf65e980f47433b6df808b9cdfcd881c222ab599d0d8aec1b487089b38eba6ebaf89272ba5b821b0367e61e8073973e7098f53d81fd6eabccaab87daf
 AUX pam_blue-0.9.0-char-locales.patch 666 BLAKE2B 11718b66138ca79641565f47613ef521e4bc1659b26982d2246ddb11ce744778c4d748d8a72bf714014b82f33967fea0b54d896aa2b786c0b9b7e66d9a6d9a11 SHA512 2a7bcc2f3d6b260a9b4803b0657114a194af90828bd5926ee1887f04304e30d2bfb46c000f190ab1de88f4646620e2c15ab8cf60fa35fb38a1d12f46cf138fe2
 DIST pam_blue-0.9.0.tar.bz2 251688 BLAKE2B ab8b56daab325ce837fc93a223067227679609413ef9389a1d6f91fb0695ed27925d2ce12a5a9a1f2bd5c0cf945646239a59a66d7e34230835b330d0cc59e149 SHA512 f611b6e3b509d2b917dd15a82f6fa3219ce554cdbf3bd224981c740bb3161dea67db9275b9bc13cd54644e0cb546eb2bb32dbff7e510170a0911b40d81f2d620
-EBUILD pam_blue-0.9.0-r1.ebuild 1152 BLAKE2B fc7b495d8c1120ff776460532a39eaf545a298d7e1406f92e4e80acfa562de4295cfbe9546d3e55ed1a2dfb320f4cefdc949ebf1b5ed01413c417f8c51210e20 SHA512 e653698485d08c6514a912e182404f8094e11ba96564fd28736a19092fd2865687c5b0dfce0d73b05aa027190810c9f86dd2222edb4bef9c35ba5d5c595de62d
+EBUILD pam_blue-0.9.0-r1.ebuild 1252 BLAKE2B 0dc6e4551cb3d88a248b02c88c1a8f4f5de4816ec977d3812e7bcc556e487bcfaaca183f671a84c8404260377e643475e85b9e794fbb842064e458b2688fba06 SHA512 5da5b26c126b7d1fc2486395db8da4259609d1e4504e7d0a94a601cb552bfec19f85e01085d70db7d2e5f7552aed63504b684c05cc5c44df846c34b19aa7677f
 MISC metadata.xml 641 BLAKE2B 57c3a6bd8abb8cf66d1cc0d8562e9e5322b50a759e517df251dfbf57b8712fb8bc2260bd95fc2a90aa806ed57d4ca64d44bd0562d994471d1ebf63440cd8e924 SHA512 db6e60879d5f176c8173cb3548d1459ffe04d788b3eafd8889341b96dfa28d61371e52037ad090b52522b50f094f85f562fb8b4d12944a843cf7d2cde923401e
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
index ef057190d039..5b2e6ba48f06 100644
--- a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
+++ b/sys-auth/pam_blue/pam_blue-0.9.0-r1.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
@@ -8,21 +8,29 @@ inherit autotools pam
 DESCRIPTION="PAM module providing ability to authenticate via a bluetooth compatible device"
 HOMEPAGE="http://pam.0xdef.net/"
 SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sys-libs/pam
-	net-wireless/bluez"
+DEPEND="
+	net-wireless/bluez
+	sys-libs/pam
+"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-char-locales.patch #412941
+	"${FILESDIR}"/${P}-bad-log.patch
+)
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-char-locales.patch #412941
-	eapply "${FILESDIR}"/${P}-bad-log.patch
+
+	# bug #778407
+	sed -i "s|-rpath='/lib/security'|-rpath /lib/security|" src/Makefile.am || die
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/sys-auth/pam_mktemp/Manifest b/sys-auth/pam_mktemp/Manifest
index 25720da98ed6..1d3f0f5025ea 100644
--- a/sys-auth/pam_mktemp/Manifest
+++ b/sys-auth/pam_mktemp/Manifest
@@ -1,4 +1,4 @@
 AUX pam_mktemp-1.1.1-e2fsprogs-libs.patch 1608 BLAKE2B a55016e42884ac7462579021d164ed196ae1f31e60886037e181c90733bfd1a6ff15a3432ffe61447a9cfd41c6231d94955819cee6cfe32e180c1004d83443c7 SHA512 92b1dbd350ccb4c0d96d3ac4aabf07a72d4d8088a8e0fab89005a500020407a64b76a2f501d59748f9a61afa96bc04e959bb29759a0aa912970d94132be0ce34
 DIST pam_mktemp-1.1.1.tar.gz 6754 BLAKE2B 5fc3cdf56c7bca9d46c339cc14eb13c74eb590ff4e19824dd2b6e313c2825ae18248873f0aca19a1c7ca8a4dfa5d6944ca9d07ea8355a4c0f7b57567a79b0e3c SHA512 e2e42115a1fe70c128397d842dc69f96863d721dfa886ebc21b5e8249333adc671d74213ecf1222d65417cd4747eb6114f515271fd7eac4376a2b7e28925996d
-EBUILD pam_mktemp-1.1.1.ebuild 1050 BLAKE2B 81c9c83cbaadbc2e8e8e6cc4e89d75a0232e2889733afb1a6c5104217420482d67f09b99b74dc2553b7d267bcef87db1856fbceee7ddcd94ea2304efa0796cc1 SHA512 e0e61ce9359495e1e4c2fb2605a60fec981e73ef0f0b5a8708203564a185b026c4ec13d3fea0716973f21be119f71bcd87cbec1ea866d5f9af3de3f892dab02c
+EBUILD pam_mktemp-1.1.1.ebuild 1051 BLAKE2B a8d13e9eecae3a7b3e66b73f78aa1b66018288a7d2665d00846ecbb488933a89ead06ce948b35e4d8e71fb219e856fd6c42523afb2e02e22394b8be3e8f61cca SHA512 14ceb7da2b17d25d48cd92ad312a41a3c622ab544b47f0850fb04c0e6398000e37ea459bf4eda1ed5acaedc01c481a880138a861a954485384f588ccdfa8fa52
 MISC metadata.xml 366 BLAKE2B d3327e5be24ffe6ad99db5c12da945dbb6bb80aed57c47089fd6b538acc1c6415b8f213c8aa08d67627d31e8f5310d870a2ec5939db8920831056ddae4b3db13 SHA512 89eb18a095c66d81e1f27db737eccded4f20bec8c4aa9a38e8198054c0e01b545f432e460f88114a7606f8fb03ba3fc0f4ec9c5de82f5700a36a9a30560b4395
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index ce7ec276c563..a0e3397d02c6 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="selinux +prevent-removal"
 
 RDEPEND="sys-libs/pam
diff --git a/sys-auth/pam_skey/Manifest b/sys-auth/pam_skey/Manifest
index 9a2589025b29..a1e280abce58 100644
--- a/sys-auth/pam_skey/Manifest
+++ b/sys-auth/pam_skey/Manifest
@@ -1,4 +1,4 @@
 DIST pam_skey-1.1.5-patches-7.tar.xz 9408 BLAKE2B d87da6c4606431618a1a4d75981809cbd91a8e5e3d1f9eae6fbb222e146d451f7c099f9b437829304b647a20c6200797732e9d01451cc4911abba7843151e36c SHA512 8bb39c2d173468c38b4d2bdac186d3f27e868c2be9dc6feffba957d4d33bc8e597c48e4638e5de09829000961fbf8b72f0ba577f232bebdfaa4c2961ede58838
 DIST pam_skey-1.1.5.tar.gz 76963 BLAKE2B ded4a4e43b174338cd1beefce65314cc906db928593dd5eba2ba1be9cab33844d8fd38cb7d3b952a29da632b671c468e0dfe7f0f1e0d167397320cd9ca6d35e1 SHA512 12817cedf15a3b2287982e4beab5d3b388239cc0a1e141e66e41759ddb2da7fb9dd0df12202dcc8140db0868c8df1a8d19d5859224179e2419ffefd691cb9834
-EBUILD pam_skey-1.1.5-r6.ebuild 1574 BLAKE2B efc09ffee6b84174059cf2a0b92d2608123e8e255a6db34eda16b26fdbc170984fef8abda0ef6d4a5b1e6333d805c54ad00b3d0ad3fcfca813e78f282ebe62d7 SHA512 262387954f1e1bda23dcec8e9d14d18d58528868805fe15ce98dcf489ae48a9273c1c06633342ea0bb6ef313d7d08936a535fd06a53f298cf28c2c3fa4ff0a93
+EBUILD pam_skey-1.1.5-r6.ebuild 1567 BLAKE2B 855556d2ff820be4401630e53b3b4f1ae0906150d7ed0401f8924f84c1b1aa52f74e9f94d70c5be659cf5d9385202924fceef4ced659bcd9967b0936685e8009 SHA512 33285229181a1c9d20e7829cc6c2766ca63e481e846490b8ea21c5b92de52c85dfee349cc81e97d686af7469500c4a5403f5eddd78636f4bae6bbfdc6732d88c
 MISC metadata.xml 298 BLAKE2B d846164710bf706b6d7fda795b74a5bf0a3303eb7c5c67b6ed422ad9002d6f3ae96abaaa086b2c223b71efd19ed2b8bb7a3313a0b3fda523f816a34e9b639f14 SHA512 97d05da80a58ee2510de2ba718681ebb5b183dd113de6b8ff3c05a43b2fbd488fff78a2e7381b0cbf0b36aeab09e125a629c2259d0ce871e9cc7a80cff1bebf5
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
index 8c065a3bf569..df9cb74af248 100644
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
+++ b/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils pam autotools multilib readme.gentoo-r1
+inherit pam autotools multilib readme.gentoo-r1
 
 DESCRIPTION="PAM interface for the S/Key authentication system"
 HOMEPAGE="http://freshmeat.net/projects/pam_skey/"
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 740adb9c56b0..f2b8c89edcb5 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -2,5 +2,5 @@ AUX pam_ssh-2.1-dot-ssh-check.patch 701 BLAKE2B 64b7ed30c85e67125ff74f1507454510
 AUX pam_ssh-gcc10-fix.patch 218 BLAKE2B ce70db54ab4267d71ec5b39770ae7b0df601ef2a24f721c19648b76a7915aab8e655906458295647cd7b31736235fe77c9a6482920410d393277914d3711cba6 SHA512 064036f99f88c142d585b0825bf6c20d10d40fb1ca06ad09be51804fd49cb2dfcbee7633a9ae5237e54b0c9aa20b2ef687fea2fa883e3022b352c78c25fc4d3f
 AUX pam_symbols.ver 35 BLAKE2B 7a18277fef3362b21eb99b602781493de6818e93d86a0553fc97e67b780644b38a5233757a0b9b728d9a1cbc26513078bf99177809b6b5f68af273352b377819 SHA512 40e2d23783153bdfefc9ec7d9caf818e1d157bfa4f3074434e034aae47e3aa7d08b04dedbe06ef60ed2a93729f0e04aa09cf8e9f6929dfb15e4ae49c75c9d0d9
 DIST pam_ssh-2.3.tar.xz 380396 BLAKE2B e228e30c6f353f631c0a1c41e82e31e7a8c573b04ab1cad4038a245b500666b42c0efa9f686d28f2386688596de761085afb1318b94fef5541f8c0ffc1e18b25 SHA512 e3ddcf851ffd8f6fb831e2dee7269c1b89283ae2f8f6aa3487bf7b1bc71d26ac9bcbd2a01c5a67a983b980bbb5151e991402940f4752741286d057843c817895
-EBUILD pam_ssh-2.3.ebuild 1872 BLAKE2B 321da7ea319749e68634d905cebdbed60df1c1b56bc3decd2339217d444506682ea99cb1085c59e2e220d78d7267f301351e17d59804b46f38ba9e50f3c70a35 SHA512 cbb21999fd375095bc843e23df7d333dc928a7b6c48e4943a556b332872fc254cdcb1d32dcc75ccdacb5a7c63041c409adb97b3914f47125a883522d1cd65ec2
+EBUILD pam_ssh-2.3.ebuild 1873 BLAKE2B 27641e083af5a258f0096816f6bcaba4b014a740b54af914166b57dd0aac4a9ea513a4ba6225d5926b56128889a4f6ba6fe3916dbfe1837cc7b75e04cf377c12 SHA512 55d1d9e922477461cf08d4c6883ddf1aa665ebe9fcbfb02560fbccc4218f47744aef878e65f52bbe925b3df0f39482f740f8eee5ba15bc2db5c8c81f0427ae08
 MISC metadata.xml 324 BLAKE2B 1f4653cabf69551457456f200b45bf0240e920ee15962ebce3d959c8bf12f85c8b2de96f3cfaf3f4a244b062f29b2aab2e24eb9c2bd886c491d4c337dc88f3ce SHA512 f90c92c4bf59d659b312bbd22526a9ef2f347d5481d89c91847996981077d1504a996a2bf0a7382f95f5a10f86e20a2ddbc0a4875e2850f9a777457e2e911d40
diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
index 8902246102f6..de6d6ae8af09 100644
--- a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
+++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
 
 LICENSE="BSD-2 BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # Only supports OpenSSH via `ssh-agent` #282993
 DEPEND="sys-libs/pam
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index a18edc3ad83e..ce0fa31a59bd 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,6 +1,6 @@
 DIST pambase-20201103.tar.gz 3295 BLAKE2B 7e104b5342842a21e10dce6e5c5a2d330ec06146b4791b888518463d915eebefbd694a809ff676b32c9c43945087935dc5c3496ae93ac17b7e4fd4e2e2974d1a SHA512 b94e47780f45c5e897b5fd073ce2184a901d241d51516ac5007658b1ae423d0f34c37a09a9e1d055962aa7158675ea7740dfe6466fad5e4a1b50b66a0812f51d
 DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
-EBUILD pambase-20201103.ebuild 2748 BLAKE2B ba2be0e95b6fcb90e0f6511ff4846e921a82f35f1d3f380db8af5a74612fe52784d1c90d2e970f0d0835c7ff18d821c7f97f35d27b3033b5c179e49cce4724a7 SHA512 4c7f2d0ccc48209d9456e29e8c239ed692159e96f814bd74aaef224b05cf5941da622f0581cb184cab2edea3e13bb31306ed5d5cecc425bb3f3a6d64d652b275
+EBUILD pambase-20201103.ebuild 2749 BLAKE2B 392d36d5d8dfae048ddd7557706527f9537b0bd308efde7ce57b92f0a5cc1638be3c063b49b1becbb622c3daf80667841c6b7aca6b9590dfbba503d62fa9030c SHA512 20988f5a8bd83a6ef209df9326672bf08884f2d1d5b0137456142c39c13b789d1f6e70ebb6edb344a258ec2240eec0be6883f2994bc73dbd3a5344f6fe6afd0a
 EBUILD pambase-20210201.1.ebuild 2874 BLAKE2B bc7d18db38111cfa61e6203bf123830a65aca5c403fed11fac96fb5b536127b861b918d9c41c452b2642deba846d3b0ee758f2134ea4771066c027178668f371 SHA512 162e3a41f0ea48b5331737eb77cac0fc1a8a82d00533ca55be353b83eb874038a7fdb23ba7c7247d9ab34633f97af8c412cfceb92c6cabfe2094e07df0469942
-EBUILD pambase-999999999.ebuild 2865 BLAKE2B 1b8f2d7c829aa5283551fdc57df1e81ab71e0b122ca344d1288348953ae78e69a5c04b9f74f9a61a243945e9347a5faff25bd87a305fe92bdaa1d141d8847e5c SHA512 dd14478aa085a5a6384dfee4bf60c64ce11144cacc8d13829e3b3d0fccba18e2ef3a1cd9b9261de99c14bf713e2252dc0f5cc039ef8df441529f5831e4d4c58a
+EBUILD pambase-999999999.ebuild 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
 MISC metadata.xml 3934 BLAKE2B ca15cea69fca97ebe00c624a8bf63293a348446b9cf6a2450338087b894f68e35cc5de037119a9534e4046e7ba6364e60397749d6ef4678f3220739603a77888 SHA512 9550417607667acdffdfb1ca9936bf697ae995a42d8be788d7215a8231bff8d92ed0caaa926450234f4720d6731efa6b9ace35900a3d6a0ce9040574399ccb77
diff --git a/sys-auth/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild
index c837b987f059..2f870076f0f1 100644
--- a/sys-auth/pambase/pambase-20201103.ebuild
+++ b/sys-auth/pambase/pambase-20201103.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
 else
 	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index 36d85c75ffcc..b4166689528b 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
 else
 	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index ae95af2fe6c5..310803aba288 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD passwdqc-1.4.0-r1.ebuild 1273 BLAKE2B 129125327a956fd698b1493d463f50e1c9d8c6d9a85665654ab8778855f676b1ed9d2c3b382499f91bbf7a69c6a4e02d4d1ff64313adc322f9b5693d2fec3810 SHA512 1c4068d4550e463f437e30353b9fe0d20c18b6342560255db3d21b48eabd362c7385f8b4c4647d1064b62210032c484e197de56bc6337d7745ef43efd8308e63
-EBUILD passwdqc-2.0.0.ebuild 1282 BLAKE2B 834853e67e9c78cd2f84c9ac2f06f0acd196060f18d0ddca51c8f9f0c9cf89672e963c64aacb821561b66616b69d21f7eb5d6d04cf8091422f08659a2d38d48a SHA512 dd89b3d468c5d79ee89ea7289064f709b70cb731ed7810bab870c7d3388be76c12f291172e76f8dce8996965cf33e6facd4916f47f9c5a9d729c65e6bd5b08de
-EBUILD passwdqc-2.0.1.ebuild 1282 BLAKE2B 834853e67e9c78cd2f84c9ac2f06f0acd196060f18d0ddca51c8f9f0c9cf89672e963c64aacb821561b66616b69d21f7eb5d6d04cf8091422f08659a2d38d48a SHA512 dd89b3d468c5d79ee89ea7289064f709b70cb731ed7810bab870c7d3388be76c12f291172e76f8dce8996965cf33e6facd4916f47f9c5a9d729c65e6bd5b08de
+DIST passwdqc-2.0.2.tar.gz 88796 BLAKE2B 4be0180dbee38d124cc5fd3780fcc27b276bd9370c59c83a9c037b67f18518873bd34d23f779125ac0b5e8bb1f40a5e8e24dc65bfe5919f735f96d4f625cebdb SHA512 60f91ad7c86314b0d9ad97a2474a1a5bbb8b41491b274e09f7300d8a609cfffb0688bf39d4e715f647f3c87bfee429cb5e01f1a641a14eea3f55b223610ed8ec
+EBUILD passwdqc-1.4.0-r1.ebuild 1264 BLAKE2B 90e181a78cbebe7be35bc898bc8d8229157ae2454044c74f4ede6a16366fa35697490543c76ace2fc3b5aa3cb2cebcb1b211b9118509515ce9797d6bb6fc69a8 SHA512 5df52075c6f1ce4750806cb170b5e2e3951a46f3b5f0956136f7f53c0e531607253d4d74cd1499dc9bb3d1ade98aad289576aed49b62f3b24cb2daafa3c237d4
+EBUILD passwdqc-2.0.0-r1.ebuild 1281 BLAKE2B 784d9f373ecce62b2762395f6639811c5465606332b3a3b1aa9e3f3b8a3d1f46055e78fdc25af885343d6b62cebd2fdd04af53ac7651749b0e448cdc836a98fc SHA512 9d519776ab0098a03835c34f1c850610b272cf46bfef2b8c5de3d0e889b26e519879987886502ed5206778ecb1a865b4e2bd32e43a4f13fae3579d67e0dd8a24
+EBUILD passwdqc-2.0.1-r1.ebuild 1281 BLAKE2B 784d9f373ecce62b2762395f6639811c5465606332b3a3b1aa9e3f3b8a3d1f46055e78fdc25af885343d6b62cebd2fdd04af53ac7651749b0e448cdc836a98fc SHA512 9d519776ab0098a03835c34f1c850610b272cf46bfef2b8c5de3d0e889b26e519879987886502ed5206778ecb1a865b4e2bd32e43a4f13fae3579d67e0dd8a24
+EBUILD passwdqc-2.0.2.ebuild 1281 BLAKE2B 784d9f373ecce62b2762395f6639811c5465606332b3a3b1aa9e3f3b8a3d1f46055e78fdc25af885343d6b62cebd2fdd04af53ac7651749b0e448cdc836a98fc SHA512 9d519776ab0098a03835c34f1c850610b272cf46bfef2b8c5de3d0e889b26e519879987886502ed5206778ecb1a865b4e2bd32e43a4f13fae3579d67e0dd8a24
 MISC metadata.xml 322 BLAKE2B 539430fc1d4d9cff3e27ab5769b9385dc822dc666accfba89a75c8228103132e0056ebbba0f16399bdf6cccb7bcf7f52de55e27a9da9cc12c38a38674bf67fb2 SHA512 8762169c70c490e144d0bc6239265e259ee1f5e2dccf75e87aa236cbc884c243432da7082ba078e20b4de7848d0c3760d8e7a3e8dac3650e3799a012a893e9be
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
index 3c77402c7fad..70be5a24a3ea 100644
--- a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/pam"
 DEPEND="${RDEPEND}"
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 _emake() {
-	emake -j1 \
+	emake \
 		SHARED_LIBDIR="/usr/$(get_libdir)" \
 		SECUREDIR="$(getpam_mod_dir)" \
 		CONFDIR="/etc/security" \
@@ -52,7 +52,7 @@ _emake() {
 }
 
 src_compile() {
-	_emake pam utils
+	_emake all
 }
 
 src_install() {
diff --git a/sys-auth/passwdqc/passwdqc-2.0.0.ebuild b/sys-auth/passwdqc/passwdqc-2.0.0-r1.ebuild
index 53fea839ad89..786e12917d1a 100644
--- a/sys-auth/passwdqc/passwdqc-2.0.0.ebuild
+++ b/sys-auth/passwdqc/passwdqc-2.0.0-r1.ebuild
@@ -27,8 +27,8 @@ src_prepare() {
 
 	# ship our own default settings
 	cat <<- EOF > "${S}/passwdqc.conf"
-		min=8,8,8,8,8
-		max=40
+		min=disabled,24,11,8,7
+		max=72
 		passphrase=3
 		match=4
 		similar=deny
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 _emake() {
-	emake -j1 \
+	emake \
 		SHARED_LIBDIR="/usr/$(get_libdir)" \
 		SECUREDIR="$(getpam_mod_dir)" \
 		CONFDIR="/etc/security" \
@@ -52,7 +52,7 @@ _emake() {
 }
 
 src_compile() {
-	_emake pam utils
+	_emake all
 }
 
 src_install() {
diff --git a/sys-auth/passwdqc/passwdqc-2.0.1.ebuild b/sys-auth/passwdqc/passwdqc-2.0.1-r1.ebuild
index 53fea839ad89..786e12917d1a 100644
--- a/sys-auth/passwdqc/passwdqc-2.0.1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-2.0.1-r1.ebuild
@@ -27,8 +27,8 @@ src_prepare() {
 
 	# ship our own default settings
 	cat <<- EOF > "${S}/passwdqc.conf"
-		min=8,8,8,8,8
-		max=40
+		min=disabled,24,11,8,7
+		max=72
 		passphrase=3
 		match=4
 		similar=deny
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 _emake() {
-	emake -j1 \
+	emake \
 		SHARED_LIBDIR="/usr/$(get_libdir)" \
 		SECUREDIR="$(getpam_mod_dir)" \
 		CONFDIR="/etc/security" \
@@ -52,7 +52,7 @@ _emake() {
 }
 
 src_compile() {
-	_emake pam utils
+	_emake all
 }
 
 src_install() {
diff --git a/sys-auth/passwdqc/passwdqc-2.0.2.ebuild b/sys-auth/passwdqc/passwdqc-2.0.2.ebuild
new file mode 100644
index 000000000000..786e12917d1a
--- /dev/null
+++ b/sys-auth/passwdqc/passwdqc-2.0.2.ebuild
@@ -0,0 +1,61 @@
+# 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"
+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/realtime-base/Manifest b/sys-auth/realtime-base/Manifest
index cad747a46e1d..1dfa8a55b867 100644
--- a/sys-auth/realtime-base/Manifest
+++ b/sys-auth/realtime-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-base-0.1.ebuild 970 BLAKE2B b6e00521775fab0d14170c57e2982ad4e5d745e638e98ec42d6db536525d04d17d527160087b19ce39ee4edfbd1ed2e6145cb0928bb2d493d3a00ce666ed7275 SHA512 e94e3d5fd24fe75a65ce68fca3582d67f11f72b7e9a3357f8fd1c6c71cc2245708459c475790ad237ca13d78d07f48d20d3aa7030ae52171a87adc1831a08e86
+EBUILD realtime-base-0.1.ebuild 971 BLAKE2B 799eb36a91c46324871f146ad21489f3ca4fb8aab7a3b93613a24943a357815fd1dad5ec9ec795805544f5fce242a23e68dd591c3873fabad17536e53b541247 SHA512 5928a24c1b7c2c2acd78a302e5aed6413deb18147630a813126cd5e8a1a36b8925fdecd7f5a49623193a3ceb64acd7a0b45bef73f5db7afb0b411fcde27af140
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index 1765c6c4d942..2faa18931f6f 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.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=6
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index c9dcc8cfceff..f13e3537fe97 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,4 +1,4 @@
 DIST skey-1.1.5-patches-6.tar.xz 34108 BLAKE2B 410dbe673e0a32a4c3fd0610f898057e7b3afcc0d0fd124683033790f9c518bf89486f13e8d87825c0959ff34e91eae82df6ba3b79c1dcb99a34d5657036d5a6 SHA512 2c807675cdd6b800f03427d79d616f59ac9d4d438221913328ec92e5dd13af185f74a24e17d36af8d49a51c4ecc5b24ef198489acce416d829e8aacf5d3c208a
 DIST skey-1.1.5.tar.bz2 61911 BLAKE2B 6226a91f4018bee5796bf60339dc8554324a044eef18a69ea176d060cb4af90779cafaee58f42ad7a6e433b94da8de6e5e4d1ee9362904966fd0872d5ac3ccce SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37
-EBUILD skey-1.1.5-r11.ebuild 1991 BLAKE2B 6b0d8ddb92dfc91657432f771aafe31331ac69c419cd3909bbe0496f4057fe886eca4b1e6f473732fde32452499afd2852f1a96956843e0075f234f60a86146c SHA512 760cbc9ed3b93d3c555ca90b54e806d336c87505679b42308c4a6638ca3ad3bfe5c7403be88db8b5f36b9e54366cf78a8a9a8fcdb144aea806db398cef3cc4ed
+EBUILD skey-1.1.5-r11.ebuild 1992 BLAKE2B 2b5c8b9bc100380957b7f7afa0ab6c7c851ce0ab5f8e01643ee07bb1de76d2ecfbd64b571b4d20105d194537589fc2769b94d96fac5c1aeb5c779a7cc8cc1931 SHA512 62d7082c5f8ca162d7e3ec302397c6d5b0be61b9760796497d108fb3e1610e69ca0814913faa872d6f33e108c7a95fb554de4b6e4834d03e148887993d205734
 MISC metadata.xml 1432 BLAKE2B efd6ff43e309d55d511d6bf4527a8565df2da6815bafb9079d465be95f128b9f17eb8019dd58a1230c41cb75eda4eba412231ec7028e9d67a05b18e33d78827b SHA512 8fe776255ff049ae9c16ee0ff157761114ca4fcc777d103e707557ef5f18fba9d65e63a77f24219e27d267cd76839abf128210969dc4330d66920a2ee574aabf
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index 7ac90385b5a0..5fac943577f3 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="BSD MIT RSA BEER-WARE"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="dev-lang/perl
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index b3e6e39d1371..b527269a0fdd 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,5 +1,5 @@
-DIST solo-python-0.0.26.tar.gz 35251 BLAKE2B 76e515667220a8efdd16e159008eed8232721e0a8a1a1bffbc773cfa832b2f112d8dc229bf69dc4ccbee1d11b41d630a2d91e2383ebd19158d8c46ccf4f355de SHA512 f97da4a4ed3b0e0f4715407b179d8a8c1385076611fe8669cec6b514313d38dd14c6c22434b73e2c72f7456407a6c942b26b72cca7a56969cfbc630ee25aad85
 DIST solo-python-0.0.27.tar.gz 35657 BLAKE2B 747d8849ad4bdda7c0e4b079dce2d7162f07dad4784bb941242dd8ea759cccd763537cec2c7cd9ecf6f467c771729217648b72aa36292622f5fc3adb8a0c280c SHA512 50d564916e07a0c65a843bd2d0328a735ba71eadcfc893b13fac84a3e51822ed2bf80fc3f7662943a5635c6cd6b3ded8ba5b5a9ac2282c9f9bcdfe9de191e445
-EBUILD solo-python-0.0.26.ebuild 1176 BLAKE2B 8ce0276e485d7428b4272e5d8e0de92a0db6846aafca666df74211595251d16fa1b1978c1d8e39af004455d120ec8354df007b900de84a9678a3befbdf0036cd SHA512 3cce3f79fb3fab66f28a4efcbe27466a23ef7081a235c4c85f97aa18809bdd494a221d4e6d0881c0f639cc2f1c52089167d78120604a196df67f7c392b750122
+DIST solo-python-0.0.28.tar.gz 34818 BLAKE2B 788d71d2641848c0e01640a87c4b20462ba3380a9005a9ab2d4452575bd4ddb560e677538a4ba42e24f9b7f282b0f7a03ce151e2823d3613ff4f93d00bc20524 SHA512 f0af3c350554fc9724f7130566019fc0b0292cbdb9035a9afa602df12e655f63b03f966605bd4b29ee5c07b0b421e9515b7ec612411d4423940461628843716f
 EBUILD solo-python-0.0.27.ebuild 1176 BLAKE2B d1d247c95a6ae62b1f8f1964f303592a2ea7639c48aaa80d6e31d3bfbcb2d3b161ad7856cc93413601ed86d65a962dcdd0a03ddb374b745ef08b047c4f9ddef0 SHA512 f642a785bb585855c0cf93de1a96b5ff129784629215dbea706acc0c21aa98d55255bfd6fbe0126b4eaa64668e28aaec7f0da5478413743c66f56e055d31fbb6
+EBUILD solo-python-0.0.28.ebuild 1134 BLAKE2B 9b6d0d85669bd07860cb9871072ed08e2d60d6253878d12a84705cb5675517df6fbe438dab427367816e45d05e4dd4400de56cf62e2a099dd1fecfc846b2508d SHA512 d0c64b6357fa0b44b54019dc74f7405d4a845a298c009ee9999c192d238ee60b44ea5cb1ff0392e7baa1f9d367ba428e9585775513f25ab75a76f221511a9538
 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.28.ebuild
index 25ce53cdef78..a0767f1bb325 100644
--- a/sys-auth/solo-python/solo-python-0.0.26.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.28.ebuild
@@ -15,13 +15,12 @@ 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}]
+RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.9.0[${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}]
diff --git a/sys-auth/ykneo-ccid-tools/Manifest b/sys-auth/ykneo-ccid-tools/Manifest
index 02fad8fd9945..f5a36a0b57cd 100644
--- a/sys-auth/ykneo-ccid-tools/Manifest
+++ b/sys-auth/ykneo-ccid-tools/Manifest
@@ -1,4 +1,4 @@
 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 556 BLAKE2B 4c86cf819e48326ce1f21d73aac546bbb638e93376005e80ed18348663fa7e58567520a6a828cb3d93bb37268c538ec93f8da665d6af2ba42d2139ea61df45b1 SHA512 3ae38112048a75fa2c40a7aef85e6e1939ad6b3bebb8305e6eaa26add7812fd175ec4b161f23fb30a90eadf61e228fa4ee275fd8767ffd4d3cd7391b2a4a0102
+EBUILD ykneo-ccid-tools-0.0.0.ebuild 553 BLAKE2B b45b93ae0faa27bf2cab191d7ad6ce47d0ceeb2898b2a62feadf85c7f9dadb4c9f89232709a4fb7b3bc22458ee42c193ea38434f87ef2e2053b65fc83946cf5a SHA512 3681a8d6cd626ec0ff0f08fbd5381140aa9337fafac05193bdc418259296cf4ef5c3e83cc17da9cb25eb5f190f6a3e94821e81b57cdcddac6756b37a5765f81c
 MISC metadata.xml 260 BLAKE2B fda138c336c3bca9b5b515da8470686a8d5e919836cf541a0aba7cc814acaecdb6b2c6dc8a1f67f67559159ecb766c662ccb4465e6cc85149f5708a8b82c6e93 SHA512 b82ee7915d9a51a9c0847ed1d90c6cacd3a59109a43115b1640c946c50bfaeba6e0a55a208704ddccb1bc19415a5a0eff8a3c960e53f70d1aec5c3275b9d673f
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
index 08d2001b65e5..ad5468406fe9 100644
--- 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils udev
+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"
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 7d44b1f8d4c0..3b6c97fa17ec 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,9 +1,6 @@
-AUX yubico-piv-tool-2.1.1-install-man-page.patch 1288 BLAKE2B 00f00f10310f0aaa5a53596bc71bc332cbdbcf2060d03c1aa6eede7872dd3b2f129c7fe37a844a4a7fa50eef468e9fd99f34c9e219a71dbae37eef9dbacc1884 SHA512 df4a2a902014fd5da7d8870dce6bcf46c41b2bfd910ca9bec9429b685d6c02335efe923cd7ab4199dd8bc8f70bec5b14d7c9adb021f926e6ac549c28739d739e
 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.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 1276 BLAKE2B 2933f90f0cc0e923a2b84e6cb2a778172baa8d274156cf983d8ae2800b56e10231d95b37e89f26b78afeeead38a6d711ecab1d873f1d23cd786d30a5d5a27a63 SHA512 d93172defe4acbd2119596bee1eaff1dff2adfe9a560c4415766299725c2971770cded9d9afd93c4f661e700def83b14c5d6a45035abedd5b42914567580b040
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
deleted file mode 100644
index 1d782767b3aa..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e635608785ed374bfe5f1158ca4a4695f3ea2f08 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Fri, 5 Jun 2020 11:09:30 -0500
-Subject: [PATCH] Fix omission of man page
-
-It was omitting the man page upon first install, so in order to get the
-man page added to the installed set of files, one would have to run
-cmake, then run make, then run cmake again, then run make.
-
-Also clarify when the extra `install` step would be added.
----
- tool/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
-index c12a474..03efefe 100644
---- a/tool/CMakeLists.txt
-+++ b/tool/CMakeLists.txt
-@@ -66,8 +66,10 @@ if (GENERATE_MAN_PAGES)
-     add_help2man_manpage (yubico-piv-tool.1 yubico-piv-tool)
- 
-     add_custom_target (yubico-piv-tool-man ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1)
-+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
- endif(GENERATE_MAN_PAGES)
- 
-+# If somehow a manpage was generated before configure started, install that too
- find_file(MAN_PAGE yubico-piv-tool.1 PATHS ${CMAKE_CURRENT_SOURCE_DIR})
- if(MAN_PAGE)
-     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
deleted file mode 100644
index 38068c17a3e7..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="amd64"
-IUSE="libressl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( 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-install-man-page.patch
-	"${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() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	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
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-auth
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)