gentoo auto-resync : 04:06:2024 - 00:07:50

6 files changed, 118 insertions, 225 deletions

diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 904275a61deb..1d239a9d5002 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,9 +1,8 @@
 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
-AUX fprintd-1.94.1-fix-meson-0.61-build.patch 4544 BLAKE2B 321971f95833db2d6957ccee1f67907e8590d91da24d684bda7ca95b50028e721b28e887a90b101c311813df0d7ca4870f12801ae91e280f00b2567c7fddc874 SHA512 73836daf2366f47bd2c69d6d50a70150778cedf04d946123be72c73f976fcd674173b0f349d9df197d06afec5190c742e8b0726380215e3dc95dcba1a49f33bf
-AUX tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch 3749 BLAKE2B d5253703954ecdb0fdb2889dd4f1dc5f5d8e32c4bb29abd22351f6c52cb0261c3bedac8b1b5c5a9c63fb097b1429067f7e56b2e7f2e196fbf8546cc09cac6c00 SHA512 79f366ada055b9348ec620646e0ec91a7c960585e0087920f0b56b9d6466613a43ed8f80b3842a56f2b626e903ed0e1db9bdc219bb7bfbb86a898b86761180aa
-DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d
+AUX fprintd-1.94.3-test-optional.patch 2430 BLAKE2B 31ae94e94ce5cd38bfb15a062871f65dc09f08ce16c188d4726726c13ba6242a5810cccaa0c4b0f5a4c53f608cb284aaca308c5646674c6b6dfaf62d35cd7d18 SHA512 eadfaa6143763f39edb06c05ea9f02267038450bbf2c06da40d760f76fb2d625c9c41193aadb161396e12278c31c291fc78de7fe526aa5d4e1c753c6a3ef076c
 DIST fprintd-v1.94.2.tar.bz2 657989 BLAKE2B 5855ab453ae6d73e08c60c699a95609262fd121ab020f9ffeafb8d1891a60f761f47e4acd11554179b6d9cbed8a734aafb012a4b6de3e9ad67d4160534a0e6c6 SHA512 0b5ebc595b617fbe9167c41a80e31ae74e7bdc87350b0420839e1a6229d7709e51ff2836858c46d8d30549a1f0811b0f697034fcdd09512b5c1099f0f0a3b112
-EBUILD fprintd-1.94.1.ebuild 2325 BLAKE2B 87156acbb51ce61066016825a2335d09bf81cffd7d7ddf23725a24465c5e976eb0d3edd7fe05297cf545c15dc112aff6e571b8b41caf767e1ef1b7ff5297cc3b SHA512 1fcdfb11651e60eec891d55132dc70dd9d12a6061fb8e91a2becd8c4ab70e94c6acd9272c0df428aced54af402329552f98d51f163cbb4d39b2b43cf608b5251
-EBUILD fprintd-1.94.2.ebuild 2265 BLAKE2B cc9d0aa24f1d0bc96b6044488656462ac33ade828f79bb46be5195af7d9a0e6dee85851b3bf41ab217570d2636bd90961eebcdd701d306ae0f828d61d1235068 SHA512 b950df2ad517caf80a10cf54c6ce21442d75e655c3bc138dcf335fa84f7d8430e850a4c348e8e9d22ea3a75a9af3f0c59b57af29b23cc83a6f50010b6158bcc2
+DIST fprintd-v1.94.3.tar.bz2 661765 BLAKE2B 9cb1170092616cb095322cde4f55b354ad9f1481600fa4faf9d48d4dc22d3e71c1ff332877211d3ea4382cf37a8865a4b5aebb4f679b485d345abcb1d7ceb239 SHA512 bd6d9c6a78e445e55e0fb9da57d46ac354a1e768f34f2f1220e123db5d8d31773020fff43952b495262bb0188bb9b330682ff04ce6767c59043b511c03f55848
+EBUILD fprintd-1.94.2.ebuild 2266 BLAKE2B 61a8c6ee6a313c4ef1776415167692fb3df2fcff74d0cbf855f2ccc717a715f424902bd822fb8b20eb5c5e6aeab4d1be863c5e6eb7e8f488e2f425dde067e044 SHA512 2cba71f655e892c9f90d60cd23830b46542fffbd05d19313a9cff8590723d52fe8c68ea16b5f93502c208833a94b4f063a6af1329c23b9708be68d8dae4ab34e
+EBUILD fprintd-1.94.3.ebuild 2188 BLAKE2B 46c6a167849ebc9c671a488e042cc58bc3768a8ae9388093204b4d1c79295b2b7ac901d7487d07e8883ee4e512e3487d7de0dcbd2a4ab9c5d415bc838fa9eebd SHA512 52dd576892db169debc6e869a4afa8ca307de0b411c842278e9e90cf7e1ef7e539c19e3f0050555482b24a2e08a5986d134121472476caad7a4397475babe01e
 MISC metadata.xml 339 BLAKE2B 40a177278acf7a0553a21bc7d14f2330e0249b2406d72b9b907a069cbdf2e9e464eb01a3b9466f080f6a55f77d2f2ee1863e399f138688e1189e50fbe262f822 SHA512 8aeee1522333ffd70de55c07a2db7bd12c3f90dade4c83d2c4d6a5f76e49969da6d4a797b4304716b5849fe738a8c41dd58c15733b55471efe63007cbba397d1
diff --git a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch
deleted file mode 100644
index e7f78320d1b9..000000000000
--- a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch
-https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch
-https://bugs.gentoo.org/831753
-
-From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 21:06:35 -0500
-Subject: [PATCH] use more idiomatic/correct embedded shell scripting
-
-Formatting arguments into code is fragile, and meson natively knows how
-to pass files as arguments via argv. So pass them as arguments to the
-shell.
----
- doc/dbus/meson.build | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
-index 802938e..861da64 100644
---- a/doc/dbus/meson.build
-+++ b/doc/dbus/meson.build
-@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files
-         capture: true,
-         command: [
-             bash, '-c',
--            'cat @INPUT@;' +
--            xsltproc.path() + ' @0@/@1@ '.format(
--                meson.source_root(),
--                files('spec-to-docbook.xsl')[0]) +
--            interface_file.full_path() + '| tail -n +2;',
-+            'cat "$1"; "$2" "$3" "$4" | tail -n +2',
-+            '_', # argv0 ignored
-+            '@INPUT@',
-+            xsltproc, files('spec-to-docbook.xsl')[0], interface_file
-         ],
-     )
- endforeach
--- 
-GitLab
-
-From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 20:46:29 -0500
-Subject: [PATCH] remove pointless copying of files into build directory
-
-I'm not entirely sure what this did, but it seems to be obsoleted by
-commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
----
- doc/dbus/meson.build                          |  6 +++---
- src/meson.build                               | 20 ++++++-------------
- ....xml => net.reactivated.Fprint.Device.xml} |  0
- ...xml => net.reactivated.Fprint.Manager.xml} |  0
- 4 files changed, 9 insertions(+), 17 deletions(-)
- rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%)
- rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%)
-
-diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
-index 861da64..431127d 100644
---- a/doc/dbus/meson.build
-+++ b/doc/dbus/meson.build
-@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header',
- )
- 
- dbus_interfaces_refs = []
--foreach interface_file: dbus_interfaces_files
--    basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip()
-+foreach interface_file: dbus_interfaces
-+    basename = run_command('basename', interface_file, '.xml').stdout().strip()
-     dbus_interfaces_refs += custom_target(basename + '_ref',
-         input: docbook_xml_header,
-         output: basename + '.ref.xml',
-         build_by_default: true,
--        depends: interface_file,
-+        depend_files: interface_file,
-         capture: true,
-         command: [
-             bash, '-c',
-diff --git a/src/meson.build b/src/meson.build
-index 1df6216..a7ce3fe 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,22 +1,14 @@
- bash = find_program('bash')
--dbus_interfaces = ['Manager', 'Device']
--dbus_interfaces_files = []
-+dbus_interfaces = files(
-+    'net.reactivated.Fprint.Manager.xml',
-+    'net.reactivated.Fprint.Device.xml',
-+)
- 
--foreach interface_name: dbus_interfaces
--    interface = interface_name.to_lower()
--    interface_file = interface + '.xml'
--    dbus_interfaces_files += custom_target('dbus_interface_' + interface,
--        input: interface_file,
--        output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
--        command: ['cp', '@INPUT@', '@OUTPUT@'],
--        install: true,
--        install_dir: dbus_interfaces_dir,
--    )
--endforeach
-+install_data(dbus_interfaces, install_dir: dbus_interfaces_dir)
- 
- # NOTE: We should pass "--glib-min-required 2.64" but cannot
- fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus',
--    sources: dbus_interfaces_files,
-+    sources: dbus_interfaces,
-     autocleanup: 'all',
-     interface_prefix: 'net.reactivated.Fprint.',
-     namespace: 'FprintDBus',
-diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml
-similarity index 100%
-rename from src/device.xml
-rename to src/net.reactivated.Fprint.Device.xml
-diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml
-similarity index 100%
-rename from src/manager.xml
-rename to src/net.reactivated.Fprint.Manager.xml
--- 
-GitLab
-
-
diff --git a/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch b/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch
new file mode 100644
index 000000000000..859c8376def1
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.94.3-test-optional.patch
@@ -0,0 +1,81 @@
+https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/199
+
+From 494df63b916bbf3ebf5e0bfc843a1b5298de63b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Thu, 30 Mar 2023 15:06:14 +0200
+Subject: [PATCH] Make building tests optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+---
+ meson.build       | 10 +++++++++-
+ meson_options.txt |  4 ++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 859bcf2..2abdd1f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -137,13 +137,16 @@ endif
+ polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
+ 
+ # Tests dependencies
++if get_option('tests')
+ pam_wrapper_dep = dependency('pam_wrapper', required: false)
+ if get_option('pam') and not pam_wrapper_dep.found()
+     warning('Dependency "pam_wrapper" required by test suite not found')
+ endif
++endif
+ 
+ xmllint = find_program('xmllint', required: false)
+ python3 = find_program('python3') # No meson without it!
++if get_option('tests')
+ python3_test_modules = {
+     'cairo': true,
+     'dbus': true,
+@@ -159,6 +162,7 @@ foreach module, required : python3_test_modules
+         warning('Python3 module \'' + module + '\' required by test suite not found')
+     endif
+ endforeach
++endif
+ 
+ cdata = configuration_data()
+ cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+@@ -182,7 +186,9 @@ endif
+ if get_option('gtk_doc')
+     subdir('doc')
+ endif
+-subdir('tests')
++if get_option('tests')
++    subdir('tests')
++endif
+ subdir('po')
+ 
+ output = []
+@@ -205,6 +211,8 @@ 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'
++if get_option('tests')
+ 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 286889e..73b28f2 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -28,3 +28,7 @@ option('gtk_doc',
+     type: 'boolean',
+     value: false,
+     description: 'Use gtk-doc to build documentation')
++option('tests',
++    type: 'boolean',
++    value: true,
++    description: 'Run tests')
+-- 
+GitLab
+
diff --git a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch b/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
deleted file mode 100644
index 409c18ea0d7b..000000000000
--- a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.launchpad.net/ubuntu/+source/fprintd/+bug/1976256
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009395
-https://salsa.debian.org/debian/fprintd/-/blob/debian/debian/patches/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
-
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 3 May 2022 12:01:37 +0200
-Subject: tests: Fix dbusmock AddDevice calls to include optional argument
-
-The dbusmock code checks that all parameters wanted by the dbus
-signature are given. As such, pass them, even though the parameters is
-optional on the python side.
-
-Origin: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa98
----
- tests/pam/test_pam_fprintd.py | 8 ++++----
- tests/test_fprintd_utils.py   | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/pam/test_pam_fprintd.py b/tests/pam/test_pam_fprintd.py
-index 99f8259..bd43497 100644
---- a/tests/pam/test_pam_fprintd.py
-+++ b/tests/pam/test_pam_fprintd.py
-@@ -82,7 +82,7 @@ class TestPamFprintd(dbusmock.DBusTestCase):
-         self.p_mock.wait()
- 
-     def setup_device(self):
--        device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe')
-+        device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe', False)
-         self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path)
-         self.device_mock.SetEnrolledFingers('toto', ['left-little-finger', 'right-little-finger'])
- 
-@@ -232,7 +232,7 @@ class TestPamFprintd(dbusmock.DBusTestCase):
-         self.assertRegex(res.errors[0], r'Failed to match fingerprint')
- 
-     def test_pam_fprintd_dual_reader_auth(self):
--        device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press')
-+        device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press', False)
-         sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path)
-         sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger'])
-         script = [
-@@ -251,12 +251,12 @@ class TestPamFprintd(dbusmock.DBusTestCase):
- 
-     def test_pam_fprintd_multi_reader_not_all_enrolled(self):
-         # Add a 1st device with actual enrolled prints
--        device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press')
-+        device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press', False)
-         empty_reader = self.dbus_con.get_object('net.reactivated.Fprint', device_path)
-         empty_reader.SetEnrolledFingers('toto', dbus.Array(set([]), signature='s')) 
- 
-         # Add a 2nd device with actual enrolled prints
--        device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press')
-+        device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press', False)
-         sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path)
-         sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger'])
-         script = [
-diff --git a/tests/test_fprintd_utils.py b/tests/test_fprintd_utils.py
-index f10d4b0..efa5893 100755
---- a/tests/test_fprintd_utils.py
-+++ b/tests/test_fprintd_utils.py
-@@ -88,7 +88,7 @@ class TestFprintdUtilsBase(dbusmock.DBusTestCase):
- 
-     def setup_device(self):
-         self.device_path = self.obj_fprintd_mock.AddDevice(
--            'FDO Trigger Finger Laser Reader', 3, 'swipe')
-+            'FDO Trigger Finger Laser Reader', 3, 'swipe', False)
-         self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint',
-             self.device_path)
-         self.set_enrolled_fingers(['left-little-finger', 'right-little-finger'])
diff --git a/sys-auth/fprintd/fprintd-1.94.2.ebuild b/sys-auth/fprintd/fprintd-1.94.2.ebuild
index 452126569d70..fedf15b5b50c 100644
--- a/sys-auth/fprintd/fprintd-1.94.2.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson pam python-any-r1 systemd
 
diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.3.ebuild
index 726954ce8249..9b1e12181f22 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.3.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson pam python-any-r1 systemd
 
 MY_P="${PN}-v${PV}"
+
 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}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc pam systemd test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,9 +27,10 @@ RDEPEND="
 	sys-auth/polkit
 	pam? (
 		sys-libs/pam
-		systemd? ( sys-apps/systemd )
-		!systemd? ( sys-auth/elogind )
-	)"
+		systemd? ( sys-apps/systemd:= )
+		!systemd? ( sys-auth/elogind:= )
+	)
+"
 
 DEPEND="
 	${RDEPEND}
@@ -38,7 +41,8 @@ DEPEND="
 			dev-python/pycairo[${PYTHON_USEDEP}]
 			pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] )
 		')
-	)"
+	)
+"
 
 BDEPEND="
 	dev-lang/perl
@@ -48,25 +52,23 @@ BDEPEND="
 		dev-libs/libxml2
 		dev-libs/libxslt
 		dev-util/gtk-doc
-	)"
+	)
+"
+
+RDEPEND+=" selinux? ( sec-policy/selinux-fprintd )"
 
 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"
-	"${FILESDIR}/${P}-fix-meson-0.61-build.patch"
-	"${FILESDIR}/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch"
+	"${FILESDIR}/fprintd-1.94.3-test-optional.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 python_check_deps() {
 	if use test; then
-		has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]"
+		python_has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]"
 	fi
 
-	has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
-	has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-	has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]"
+	python_has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
+	python_has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -74,16 +76,16 @@ pkg_setup() {
 }
 
 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
+	local emesonargs=(
+		$(meson_use test tests)
+		$(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() {