Updating liguros repo21.1.2

38 files changed, 660 insertions, 200 deletions

diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
index 869fe92ebae0..0343d60297c0 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="EUPL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 8bb9d4b5ee29..4e4e17be2da5 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1 +1,2 @@
 DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472
+DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
diff --git a/sys-auth/elogind/elogind-246.9.2.ebuild b/sys-auth/elogind/elogind-246.9.2.ebuild
new file mode 100644
index 000000000000..79d70653448e
--- /dev/null
+++ b/sys-auth/elogind/elogind-246.9.2.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/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 c0a22b06a9dc..7995d31c2bec 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1 +1,2 @@
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
+DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
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.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
index b2842119b4e4..7769c96d3107 100644
--- a/sys-auth/fprintd/fprintd-0.8.1.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
@@ -18,7 +18,7 @@ IUSE="doc pam static-libs"
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
-	sys-auth/libfprint
+	sys-auth/libfprint:0
 	sys-auth/polkit
 	pam? ( sys-libs/pam )
 "
@@ -55,10 +55,10 @@ src_install() {
 	dodoc AUTHORS NEWS README{,.transifex} TODO
 	newdoc pam/README README.pam_fprintd
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins doc/{fprintd-docs,version}.xml
-		insinto /usr/share/doc/${PF}/html/dbus
-		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
+		docinto html
+		dodoc doc/{fprintd-docs,version}.xml
+		docinto html/dbus
+		dodoc doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
 	fi
 }
 
diff --git a/sys-auth/fprintd/fprintd-0.8.1-r1.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
index 9a371cd46221..42c82b1510e9 100644
--- a/sys-auth/fprintd/fprintd-0.8.1-r1.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,23 +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
+	sys-auth/libfprint:0
 	sys-auth/polkit
-	pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
+	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
@@ -40,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)"
 }
@@ -52,15 +57,15 @@ src_install() {
 
 	keepdir /var/lib/fprint
 
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS NEWS README{,.transifex} TODO
 	newdoc pam/README README.pam_fprintd
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins doc/{fprintd-docs,version}.xml
-		insinto /usr/share/doc/${PF}/html/dbus
-		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
+		docinto html
+		dodoc doc/{fprintd-docs,version}.xml
+		docinto html/dbus
+		dodoc doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
 	fi
 }
 
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 d69628fa8c7c..92a0621828d2 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/keystone/keystone-18.0.0.ebuild b/sys-auth/keystone/keystone-18.0.0.ebuild
index 622511e9577a..2d62d9ca3956 100644
--- a/sys-auth/keystone/keystone-18.0.0.ebuild
+++ b/sys-auth/keystone/keystone-18.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index efc89c6a426b..d95d6f98ffcf 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,6 +1,5 @@
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
-DIST libfprint-1.90.0.tar.gz 1760869 BLAKE2B fd0692e5a4924101399684289501d607da2183acf7f7b7c7ce22b7ed301fe0da75cb0b88c0642e1b1b6f82fe7d8505616ead456b48c3b0449201fd91669ce782 SHA512 99d7a62b3a1c329a2c13f508c98b60c6311fd01cd165fca12de5873305980167dd79c7d75edc74f53fce5066047e814fa654c6ac4f3f12342b57afa5b2dbe6d3
 DIST libfprint-1.90.1.tar.gz 2348486 BLAKE2B d9f43253d8be874f3d78e19dbd148788d8abdc3cd0d6f5c931a4aad650acaf647f9c818c22a575f9ebe0a698a338693448f6f460c780adcd7140dedbdc4e025f SHA512 0548d29e55aaa59e73f0fd13cac6b85dd3a048358c365423e12884c3877c3e30422ee3fc4d18a3daba2f26383fb886f1d40a74dba5d947f7bdec6b8852995b4e
 DIST libfprint-1.90.2.tar.gz 4152489 BLAKE2B d8e8dde93acfc83dc253741517eb840b1a950b5626f2aabef4d4a44fcef2db95096e7d467ae3191c3478e93c0919acbf48010b0c4dd23a538466a25d8204ddf6 SHA512 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226
-DIST libfprint-1.90.3.tar.gz 4169175 BLAKE2B ae883910dac19159c9183eac263d0ab71a92f67c233d9ec562630897f51063154bc207f54b41396ce169e87304d7989930b3f3204b87590eb56a82f7e796eba9 SHA512 3420df99c0e388af523f74c008fe603d28599d2ca482ec12a777d8b876e959cac946405fb14ba41fa536997ebd6857d945453e1374a0e05cd8f4fb02ca739891
+DIST libfprint-1.90.6.tar.gz 6375191 BLAKE2B 0e6300da25eb910dc50c3752731f877ad26093bd901a8de222ec21965596fe88e643b0923edc4e100d96e3910595bb00c3935ef8b19840ac5c4ff1d9405f2d09 SHA512 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
index b3d49b6892ca..c51abbccdffa 100644
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ b/sys-auth/libfprint/libfprint-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/glib:2
 	 x11-libs/libX11
 	 x11-libs/libXv"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
diff --git a/sys-auth/libfprint/libfprint-1.90.0.ebuild b/sys-auth/libfprint/libfprint-1.90.0.ebuild
deleted file mode 100644
index 67d5a6c7c811..000000000000
--- a/sys-auth/libfprint/libfprint-1.90.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 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"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 "_").tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/nss
-	>=dev-libs/libgusb-0.3.1
-	virtual/libusb:1=
-	x11-libs/gtk+:3
-	x11-libs/pixman
-	x11-libs/libX11
-	x11-libs/libXv"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
-			-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/libfprint-1.90.3.ebuild b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
index 311455ba8c5a..f58fbf922a7d 100644
--- a/sys-auth/libfprint/libfprint-1.90.3.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.1-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
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d
diff --git a/sys-auth/libfprint/libfprint-1.90.2.ebuild b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
index 311455ba8c5a..f58fbf922a7d 100644
--- a/sys-auth/libfprint/libfprint-1.90.2.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.2-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
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d
diff --git a/sys-auth/libfprint/libfprint-1.90.1.ebuild b/sys-auth/libfprint/libfprint-1.90.6.ebuild
index 311455ba8c5a..f58fbf922a7d 100644
--- a/sys-auth/libfprint/libfprint-1.90.1.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.6.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
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index 671dd524ae6f..3e7348997e6a 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/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
index 549abcb18236..6d57251b5672 100644
--- a/sys-auth/munge/munge-0.5.13-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug gcrypt static-libs"
 
 DEPEND="
diff --git a/sys-auth/nss_ldap/metadata.xml b/sys-auth/nss_ldap/metadata.xml
index ea53bf9a737a..5208c66b5efe 100644
--- a/sys-auth/nss_ldap/metadata.xml
+++ b/sys-auth/nss_ldap/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ldap-bugs@gentoo.org</email>
-		<name>Please assign bugs to this mail alias.</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index e2c4971e05ee..f28deead4730 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
 
 DEPEND=">=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 		sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
index cf69a6bf4c9d..56bbf56885ef 100644
--- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils pam
+inherit pam
 
 DESCRIPTION="pam module to authenticate users via PostgreSQL"
 HOMEPAGE="https://sourceforge.net/projects/pam-pgsql/"
@@ -17,18 +17,17 @@ fi
 RDEPEND="sys-libs/pam
 	>=dev-db/postgresql-8.0:=
 	>=dev-libs/libgcrypt-1.2.0:0="
+
 DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_configure() {
 	econf \
 		--sysconfdir=/etc/security \
-		--libdir=/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF}
+		--libdir=/$(get_libdir)
 }
 
 src_compile() {
@@ -37,7 +36,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" pammoddir="$(getpam_mod_dir)" install
-	find "${ED}" -name '*.la' -delete
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-auth/pam_abl/pam_abl-0.6.0.ebuild b/sys-auth/pam_abl/pam_abl-0.6.0.ebuild
index a67acb2fe523..c449ae2b9468 100644
--- a/sys-auth/pam_abl/pam_abl-0.6.0.ebuild
+++ b/sys-auth/pam_abl/pam_abl-0.6.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN/_/-}"
 MY_P="${MY_PN}-${PV}"
 
-inherit flag-o-matic pam cmake-utils db-use multilib
+inherit cmake db-use pam
 
 DESCRIPTION="PAM module for blacklisting hosts and users repeatedly failed authentication"
 HOMEPAGE="https://sourceforge.net/projects/pam-abl/"
@@ -15,7 +15,6 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND=">=sys-libs/pam-0.78-r2
 	>=sys-libs/db-4.2.52_p2:="
@@ -31,20 +30,13 @@ src_configure() {
 		-DDB_LINK_DIR=/usr/$(get_libdir)
 		-DDB_LIBRARY=$(db_libname)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodir $(getpam_mod_dir)
 	mv "${D}"/usr/lib/security/*.so "${D}"/"$(getpam_mod_dir)" || die
 
 	dodoc doc/*.txt README
 }
-
-pkg_preinst() {
-	if has_version "~${CATEGORY}/${PN}-0.5.0" ; then
-		ewarn "Note: the 0.5.0 release named the module 'pam-abl.so' by accident; this version"
-		ewarn "fixes that and uses 'pam_abl.so' again.  Please update your config files."
-	fi
-}
diff --git a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild b/sys-auth/pam_fprint/pam_fprint-0.2-r2.ebuild
index 4f4498908b02..bc98a557503a 100644
--- a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
+++ b/sys-auth/pam_fprint/pam_fprint-0.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit pam
 
@@ -12,10 +12,9 @@ SRC_URI="mirror://sourceforge/fprint/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
-	sys-auth/libfprint
+	sys-auth/libfprint:0
 	sys-libs/pam"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index 2801dc4e1707..c91ac534c654 100644
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib-minimal pam
+EAPI=7
+
+inherit multilib-minimal pam
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="https://www.padl.com/OSS/pam_ldap.html"
@@ -10,13 +11,13 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ssl sasl"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	sys-libs/pam[${MULTILIB_USEDEP}]
+DEPEND="sys-libs/pam[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
+
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 8da75b09b756..aa1f2ed80637 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/sys-auth/pam_mount/metadata.xml b/sys-auth/pam_mount/metadata.xml
index 7a4c23f3e8e5..7999053d3282 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..1c92523a7c50
--- /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="https://sourceforge.net/projects/pam-mount/"
+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/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild
index 98970e6e2924..72248f58fce1 100644
--- a/sys-auth/pambase/pambase-20201103.ebuild
+++ b/sys-auth/pambase/pambase-20201103.ebuild
@@ -9,11 +9,18 @@ inherit pam python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="PAM base configuration files"
 HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+else
+	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
@@ -52,8 +59,6 @@ python_check_deps() {
 	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
-S="${WORKDIR}/${PN}-${P}"
-
 src_configure() {
 	${EPYTHON} ./${PN}.py \
 		$(usex caps '--caps' '') \
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
new file mode 100644
index 000000000000..72248f58fce1
--- /dev/null
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit pam python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+else
+	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	pwhistory? ( || ( passwdqc pwquality ) )
+"
+
+MIN_PAM_REQ=1.4.0
+
+RDEPEND="
+	>=sys-libs/pam-${MIN_PAM_REQ}
+	elogind? ( sys-auth/elogind[pam] )
+	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		sys-auth/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
+	pwquality? ( dev-libs/libpwquality[pam] )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	systemd? ( sys-apps/systemd[pam] )
+"
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	${EPYTHON} ./${PN}.py \
+		$(usex caps '--caps' '') \
+		$(usex debug '--debug' '') \
+		$(usex elogind '--elogind' '') \
+		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex minimal '--minimal' '') \
+		$(usex mktemp '--mktemp' '') \
+		$(usex nullok '--nullok' '') \
+		$(usex pam_krb5 '--krb5' '') \
+		$(usex pam_ssh '--pam-ssh' '') \
+		$(usex passwdqc '--passwdqc' '') \
+		$(usex pwhistory '--pwhistory' '') \
+		$(usex pwquality '--pwquality' '') \
+		$(usex securetty '--securetty' '') \
+		$(usex selinux '--selinux' '') \
+		$(usex sha512 '--sha512' '') \
+		$(usex systemd '--systemd' '') \
+	|| die
+}
+
+src_test() { :; }
+
+src_install() {
+	local DOC_CONTENTS
+
+	if use passwdqc; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file"
+	fi
+
+	if use pwquality; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
+				page and then edit the /etc/security/pwquality.conf file"
+	fi
+
+	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
+
+	dopamd -r stack/.
+}
+
+pkg_postinst() {
+	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
+}
diff --git a/sys-auth/polkit/polkit-0.116-r1.ebuild b/sys-auth/polkit/polkit-0.116-r1.ebuild
index 1f872b3a5df2..e68234b005a6 100644
--- a/sys-auth/polkit/polkit-0.116-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.116-r1.ebuild
@@ -21,6 +21,7 @@ BDEPEND="
 	acct-user/polkitd
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
 	dev-libs/gobject-introspection-common
 	dev-libs/libxslt
 	dev-util/glib-utils
diff --git a/sys-auth/polkit/polkit-0.117.ebuild b/sys-auth/polkit/polkit-0.117.ebuild
index 81ee0f97f217..800d91a13472 100644
--- a/sys-auth/polkit/polkit-0.117.ebuild
+++ b/sys-auth/polkit/polkit-0.117.ebuild
@@ -21,6 +21,7 @@ BDEPEND="
 	acct-user/polkitd
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
 	dev-libs/gobject-introspection-common
 	dev-libs/libxslt
 	dev-util/glib-utils
diff --git a/sys-auth/polkit/polkit-0.118.ebuild b/sys-auth/polkit/polkit-0.118.ebuild
index 02ecc8c4a3bc..d6c8489322df 100644
--- a/sys-auth/polkit/polkit-0.118.ebuild
+++ b/sys-auth/polkit/polkit-0.118.ebuild
@@ -21,6 +21,7 @@ BDEPEND="
 	acct-user/polkitd
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
 	dev-libs/gobject-introspection-common
 	dev-libs/libxslt
 	dev-util/glib-utils
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index 170da001fd52..1765c6c4d942 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild
@@ -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/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 75bb2f3628a0..30bdb1555fdc 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,2 +1 @@
-DIST ykpers-1.19.3.tar.gz 127789 BLAKE2B 8dfc2751be92e69fcf98f5dc75d87eb170a4f70ff13faa321a85d4a04e27818823acbf02284ba23cb78ea758111513457ced4cdaa6961621a91f68b059eff378 SHA512 436c9807e488f7b324b892da7bfc7ea93e2b746cc3ae075822e9e8bfe478ef8e61c194127e5d4f50f6c1d9512292640d033464cceb6b8a18069411ff7993cc52
 DIST ykpers-1.20.0.tar.gz 127975 BLAKE2B 8753332be4df3eeb6ef0489782037fca12883a263d5697cfaee901763e4698ca5415953da1c2f8b3512de041c1e78735c03a5e6ea2101c71ada36d4e6d5d3d2d SHA512 a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823
diff --git a/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild b/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild
deleted file mode 100644
index 88bc388c29c8..000000000000
--- a/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools udev
-
-DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
-SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/json-c:=
-	>=sys-auth/libyubikey-1.6
-	virtual/libusb:1"
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/yubikey-personalization-${PV}"
-
-DOCS=( doc/. AUTHORS NEWS README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir=/usr/$(get_libdir)
-		--localstatedir=/var
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	udev_dorules 69-yubikey.rules
-
-	find "${D}" -name '*.la' -delete || die
-}