gentoo auto-resync : 28:12:2022 - 02:11:45

5 files changed, 104 insertions, 123 deletions

diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 8ddb039a0678..75cab0a9b91a 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,10 +1,9 @@
-AUX fprintd-0.8.1-fno-common.patch 1053 BLAKE2B a1cec2d6317ac0bffd131bf305c5ad0b2d69f8bf84e2de78dd5c2b04e2ae7f939243009cb38dc2c618568f1aa33eea0a53dc0ef93a96e998a90e4b6c5fdf3150 SHA512 4a762befbceda0bc35b576a1af42c7d49c7add5eb4f76eb0ec31d7ddb0f96e0a70591e64437d2a61fff8e9d903839340d31719c354753e7af01dbb3e585081bc
 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-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d
-EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
-EBUILD fprintd-1.94.1.ebuild 2327 BLAKE2B eb66f828207605a635e5e281b9aa8de577da653d021e2066868974c9027a97035994d3b9298177b322df8edb7a31775679908e4fe1d16425405286cbaa4a8135 SHA512 19b5096d9c727234a1c2a5dc0e73fc0154a9edd96be8522293c442e0638b73b1de0c6e1409097b99425a0af2511f2807eee2906f5321f5099d3c5743c3db0c9c
+DIST fprintd-v1.94.2.tar.bz2 657989 BLAKE2B 5855ab453ae6d73e08c60c699a95609262fd121ab020f9ffeafb8d1891a60f761f47e4acd11554179b6d9cbed8a734aafb012a4b6de3e9ad67d4160534a0e6c6 SHA512 0b5ebc595b617fbe9167c41a80e31ae74e7bdc87350b0420839e1a6229d7709e51ff2836858c46d8d30549a1f0811b0f697034fcdd09512b5c1099f0f0a3b112
+EBUILD fprintd-1.94.1.ebuild 2325 BLAKE2B 295820b29120148262ae030daebebfec95a89bdf56821838e6c24d39dfb3aeaea8ecf8f428b457aec6bb1c6af1f733cb809280e47f544f65c81727dca25ef602 SHA512 a1aa6c83d669f9cd6cc1b6a076b966df52480790d6d5d89ac1db020bba8af28e6e3b56a755dfa57d50f2b358919f58aa2b2733b57968b6fd082630f857d99f13
+EBUILD fprintd-1.94.2.ebuild 2204 BLAKE2B 7be73231aa185461ad57d1da8448487e7e86caaf6fdd21b35f10cca25f247b71f45e8b32945de8916a8637867f19f92d6ecd77be5fcf41dd057fb0a938eba7b3 SHA512 fcccbcd5ad72a48a080fc158455a2ed7fde10f85e02e91ec0e423722d055434127e99c9d7e340139c6b61f8baaf3af5b20318e5735682f82def4df7fd645b24e
 MISC metadata.xml 339 BLAKE2B 40a177278acf7a0553a21bc7d14f2330e0249b2406d72b9b907a069cbdf2e9e464eb01a3b9466f080f6a55f77d2f2ee1863e399f138688e1189e50fbe262f822 SHA512 8aeee1522333ffd70de55c07a2db7bd12c3f90dade4c83d2c4d6a5f76e49969da6d4a797b4304716b5849fe738a8c41dd58c15733b55471efe63007cbba397d1
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
deleted file mode 100644
index ba4574fce60d..000000000000
--- a/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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/fprintd-0.8.1-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
deleted file mode 100644
index cd5fba5f403f..000000000000
--- a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam systemd
-
-DESCRIPTION="D-Bus service to access fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
-MY_PV="V_$(ver_rs 0- _)"
-SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc pam"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-auth/libfprint:0
-	sys-auth/polkit
-	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
-	)"
-
-S="${WORKDIR}"/${MY_PV}
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	default
-
-	sed -i 's#@localstatedir@/lib/fprint#@localstatedir@/fprint#g' data/fprintd.service.in || die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable pam) \
-		$(use_enable doc gtk-doc-html) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		pammoddir=$(getpam_mod_dir)
-
-	keepdir /var/lib/fprint
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc AUTHORS NEWS README{,.transifex} TODO
-	newdoc pam/README README.pam_fprintd
-	if use doc ; then
-		docinto html
-		dodoc doc/{fprintd-docs,version}.xml
-		docinto html/dbus
-		dodoc doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
-	fi
-}
-
-pkg_postinst() {
-	elog "Please take a look at README.pam_fprintd for integration docs."
-}
diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
index 0de0d26a596f..aee7e8031483 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/fprintd/fprintd-1.94.2.ebuild b/sys-auth/fprintd/fprintd-1.94.2.ebuild
new file mode 100644
index 000000000000..65065793fd36
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.94.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc pam systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=sys-auth/libfprint-1.94.0:2
+	sys-auth/polkit
+	pam? (
+		sys-libs/pam
+		systemd? ( sys-apps/systemd:= )
+		!systemd? ( sys-auth/elogind:= )
+	)
+"
+
+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
+	)
+"
+
+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}/${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=(
+		$(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."
+}