From ea4d151432fe7a6a000e6a587665b85d3a54c670 Mon Sep 17 00:00:00 2001
From: David Guglielmi <david.guglielmi@gmail.com>
Date: Tue, 4 Jan 2022 21:20:03 +0100
Subject: [PATCH] sys-auth/fprintd: bump to 1.94.1

---
 sys-auth/fprintd/Manifest                     |  4 +-
 ...td-1.90.9.ebuild => fprintd-1.94.1.ebuild} | 60 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)
 rename sys-auth/fprintd/{fprintd-1.90.9.ebuild => fprintd-1.94.1.ebuild} (58%)

diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 02545ea..cbde268 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,6 +1,6 @@
 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
 DIST fprintd-v1.94.0.tar.bz2 656308 BLAKE2B f64f92af51f2d3eda059640cdfa88b26ca12326b3082e9489f6d807ec566aced86e1d19a59ad247ec2aaa6e6a90dd3d030c18e062e39143a1d4110e62e7ad03d SHA512 1ab8cf93d10317201c3f83880b9e6de4a391c2a12afe29725ae3556a7b0108a374eb96f6b2b5be69c01c386f62e3543e3f9a974867256c99e690dd19bdd5778d
-EBUILD fprintd-1.90.9.ebuild 1678 BLAKE2B 5dd4d457a1a14baa17aa7582b15b090ce3115764e94eda4a70414021837e9aa93da21e7b77daf5f53d920a6a91c6a1e2acf614f922c5ff2284269a5214283604 SHA512 07645d14c489aca303a861c284a08ca9301ed96e3e78c3eea7e120dc1705d08215d63e2c8322b7e2e322254b042f96141a6913ab4cdd415407358616e49b1a64
+DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d
 EBUILD fprintd-1.94.0.ebuild 2172 BLAKE2B cfdbfc5bb3ef399c07e0e3740242a14eae576cc0f81c4aea6d688373b794cf8154287ff63364ccb036cfa639537d5dbaed08f1587a8f99080d0f7bd726373f23 SHA512 39bbefe703f919557d396654c5a5afae249ce89ddaea4f83d23e7aef3623975394e6b284397278acd304b24d0b6f88a3eb3a8e504c2c067ae914f1c3aea693f4
+EBUILD fprintd-1.94.1.ebuild 2219 BLAKE2B a3d631ea8a080445f7cab8d7bbe11c127c60dc6864a23fadb605a6323d51f0d1f5da36aca09937498249086cb5badf03fe9f0ead9221d9e9df61dc33215f04e4 SHA512 752ebb40ab46787294ad1d577e0b47013c49c844e61470aee34515ba4c68f0d01aed6893589f44abd95c515773f283ae35491e3c53f1347e0b44c0364e0456af
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
similarity index 58%
rename from sys-auth/fprintd/fprintd-1.90.9.ebuild
rename to sys-auth/fprintd/fprintd-1.94.1.ebuild
index b2563c7..90bc312 100644
--- a/sys-auth/fprintd/fprintd-1.90.9.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -1,55 +1,75 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit meson pam systemd
+PYTHON_COMPAT=( python3_{8..10} )
 
+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}/${PN}-v${PV}.tar.bz2"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
-	|| ( sys-auth/libfprint:2 >=sys-auth/libfprint-tod-1.90.1 )
+	|| ( >=sys-auth/libfprint-1.94.0:2 >=sys-auth/libfprint-tod-1.94.2:2 )
 	sys-auth/polkit
 	pam? (
+		sys-libs/pam
 		systemd? ( sys-apps/systemd )
 		!systemd? ( sys-auth/elogind )
-		sys-libs/pam
-	)
-"
-DEPEND="${RDEPEND}"
+	)"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] )
+		')
+	)"
 
 BDEPEND="
 	dev-lang/perl
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
 	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}"
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		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}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_configure() {
 		local emesonargs=(