gentoo resync : 22.01.2021

7 files changed, 239 insertions, 15 deletions

diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 981ccf25478e..09f239828dda 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,4 +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
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
+DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 EBUILD fprintd-0.8.1-r2.ebuild 1467 BLAKE2B 09c611813121532bb15a25e849d64d4e7eca38e8c2dcd5909877532b104151c0ce8301ff902636c206b03e4ce474d023208de46b899f1039acc990e793e98dfd SHA512 7e5ca0b4a0971497a47bc35cdc0e4f0db8c63d174398059832fc21d164ada79687f49ae11238ae7ed30d4d8f50f4e219891e3ab809657bd6320bfc63bae0aad5
-EBUILD fprintd-0.8.1-r3.ebuild 1622 BLAKE2B 2257a40fa51990c0827fa9e1e92c27a9edf1380c4812477ced953fb4480b17a76c8a17c9e005d0472323c10ebe528cb321b0c862ff263c34e2df61db8b40ddc4 SHA512 965200858f04546035f3f9d5e14e24125945acc2d371905acd953d915e8b12e4015ca268b15b2f99a779f5ee7bf6e414344cfa5615272408b25d551fa66c6dae
-MISC metadata.xml 344 BLAKE2B 9a02f1005090b51c476c6705fe5627cf66dfdc3c4168e917b47651510b0596a6582bb2e4bc09bdd943c202a49a9e3d9bf58a03badeb1bd45f017b6bfef236fe9 SHA512 93369d8bd0b3f7c65b2f6a49f9e35b438879ffdd5c4b4906a4f3e09b0ce74dad1bb6f204c58be724edb88cb4e6a0380e28f516bd1c3bdcd904b8b9e8955dbd8d
+EBUILD fprintd-0.8.1-r3.ebuild 1640 BLAKE2B fd057037d273e14209e62466c39d2fe1f37a1a2908ae812963e58a8f2de10de0144016a568be8821576b25b282bfa6665bed7fd8827da98918f9cfce3f7813da SHA512 bb4d283d9d384808f79dc5a47591d2925948872116629e1779e5174f584fe8415ff7170b43fb2b719d0e2cf1adb7c8c5f6404567c1661a87e2cea17f5971c765
+EBUILD fprintd-1.90.8.ebuild 1604 BLAKE2B 445c13a35b6aad523d30dd2c51f2714ac452afc274f3d30373249923bcdd207423c4fc58af81b98b10312b571fb61af28224a5ac9c90db54ef6ebb08bc1f1414 SHA512 2cd1acd1e9a02e4bc4e4a9c836b2cb845affa688819bb95b7afbbd0355668fdf9d750c9c574b36575765db71bbb5c2efe5e0e9bfdd6da491204aafce8820b47f
+MISC metadata.xml 265 BLAKE2B 9c8a5ab87f06a4bb41749d77607017b51bd9a8a11167b44243fe3239fdd810b39d874abb0bc37d24977a59d6c1c0e9a447c3d18f5da2b4cd0feba10ccb14f048 SHA512 13396b6bc6de9ca04d98c0e94bd71b2f0b5b73238c21fac6f9fa3db9f5ab20efca035e84ae625b34a67bcc3c4f69acff1b57df96a28766ad59b6bbd65c8cb1b7
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-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
index 897c45965ff9..42c82b1510e9 100644
--- a/sys-auth/fprintd/fprintd-0.8.1-r3.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,25 +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:0
 	sys-auth/polkit
-	pam? ( sys-libs/pam )
-"
+	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
@@ -42,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)"
 }
@@ -54,7 +57,7 @@ src_install() {
 
 	keepdir /var/lib/fprint
 
-	find "${ED}" -type f -name "*.la" -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS NEWS README{,.transifex} TODO
 	newdoc pam/README README.pam_fprintd
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 19586c3df843..91a72ded097f 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>