diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 832e7f7..4be1ed6 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,2 +1,4 @@
-DIST fprintd-1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
-EBUILD fprintd-1.90.9.ebuild 1576 BLAKE2B 673552caecde39bc9e8d69da4ce25c8e99df3dabe6b916ec03912d099b2f879b9cad8bb09f16affaae64fc6a34c3c758edb3171247478889abb84c377787b18f SHA512 5302c733484f04dfcaafc7057bf7f7aad4e036b8d6afca77525c2718cef22afc08a99d8ce5622c2c8a37435368e5539c69af82bcabd3c48ba57f6870502e2a82
+AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAKE2B 838b56e110fdf670816fb59e7ad30b908c54b8ee1cbbe4fda0334ac068265c8cdcb7e48200796b0872718099dea918554641dc02670e32e5f9369f7cc05fb95b SHA512 553e6baa7d1a90971627e3e1303488734596f83fea4413d2a4ce2688f003cded95182b652622f758f4e347b54a1294837a2014a9e36badc25e8b254947a54736
+AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699
+DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
+EBUILD fprintd-1.90.9.ebuild 1678 BLAKE2B 5dd4d457a1a14baa17aa7582b15b090ce3115764e94eda4a70414021837e9aa93da21e7b77daf5f53d920a6a91c6a1e2acf614f922c5ff2284269a5214283604 SHA512 07645d14c489aca303a861c284a08ca9301ed96e3e78c3eea7e120dc1705d08215d63e2c8322b7e2e322254b042f96141a6913ab4cdd415407358616e49b1a64
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild
index fa0d012..b2563c7 100644
--- a/sys-auth/fprintd/fprintd-1.90.9.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.9.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
@@ -7,56 +7,68 @@ 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 -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc pam"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="doc pam systemd test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
-	|| ( >=sys-auth/libfprint-1.90.1 >=sys-auth/libfprint-tod-1.90.1 )
+	|| ( sys-auth/libfprint:2 >=sys-auth/libfprint-tod-1.90.1 )
 	sys-auth/polkit
-	pam? ( sys-libs/pam )
+	pam? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( sys-auth/elogind )
+		sys-libs/pam
+	)
 "
-DEPEND="${RDEPEND}
-	dev-python/dbusmock
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )
-	pam? ( sys-libs/pam_wrapper )
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-python/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_use pam)
-		$(meson_use doc gtk_doc)
-		-Dsystemd=true
-		-Dpam_modules_dir="$(getpam_mod_dir)"
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-	)
-	meson_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
-	keepdir /var/lib/fprint
 
-	find "${D}" -name "*.la" -delete || die
-
-	dodoc AUTHORS NEWS README{,.transifex} TODO
+	dodoc AUTHORS NEWS README TODO
 	newdoc pam/README README.pam_fprintd
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins ${BUILD_DIR}/doc/{fprintd-docs,version}.xml
-		insinto /usr/share/doc/${PF}/html/dbus
-		doins ${BUILD_DIR}/doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
-	fi
 }
 
 pkg_postinst() {