gentoo resync : 27.03.2021

5 files changed, 93 insertions, 76 deletions

diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index cc1de4b9e6ee..28472271515f 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -3,7 +3,8 @@ AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAK
 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
+DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
-EBUILD fprintd-1.90.8.ebuild 1610 BLAKE2B 15b77cb219868a97e5824b5da311d86306d104168c10fe579e5708b7d6888c2d04a806f29a9cdaa20742686e1ac35d269bb453d45b2d35b8c683d38259e4acf2 SHA512 b138146bc440308a95c700e56fba94419d00bc9ddaaff149d6de8207fe9fba94ce866f432a11e8d77cc6d70bb0d06dfcf3ea469c29d43fd3e9e71bab3278872d
-MISC metadata.xml 265 BLAKE2B 9c8a5ab87f06a4bb41749d77607017b51bd9a8a11167b44243fe3239fdd810b39d874abb0bc37d24977a59d6c1c0e9a447c3d18f5da2b4cd0feba10ccb14f048 SHA512 13396b6bc6de9ca04d98c0e94bd71b2f0b5b73238c21fac6f9fa3db9f5ab20efca035e84ae625b34a67bcc3c4f69acff1b57df96a28766ad59b6bbd65c8cb1b7
+EBUILD fprintd-1.90.8.ebuild 1609 BLAKE2B b740300da0690938cd618f1ed5a1380634e0bb041ed0b2634b1327b22a34c7ce5c763d9df1a980aad21cddc191c252258c2ad2128436cc20c2dc796042c87725 SHA512 9ca0ab30704e9b13be1e4569cc6f3e2a4d9047c07d52c0a292dc19287149052bc3dddf0b0f9ceb53f6698231a4b2764680dc9d08f6f38302d0dfee6eb3c371a2
+EBUILD fprintd-1.90.9.ebuild 1611 BLAKE2B a80960a38149b71ad8fe315293804d4c5c26173468f7d45aef781d619634b80b66b66fac05d9bded0edbe14ec788d228ba6c8f0fb8943cec9da6ebf10ad7fd59 SHA512 87f15ab1d74b026f1b028824c91a774e6b10f22a0364c63209c0efd07000a40d94c5b0d98595c066b79d42af660972d2150cf84a23fcb98a79807e3b8d18b791
+MISC metadata.xml 497 BLAKE2B 7fda00be12c7ce6dac7a00baea03d91414279033d86c10a233f00db2c876c224043c21f16c52922ac548c17861f381fa3989f9895bce41a0f34afa1d75e2e883 SHA512 29b70d7a55147573fbac8c6a40c8b5b82ebb5c6a6f2852f49d872eac9a44290b4d07e0ba1d754ae5e6656e00de05a47db6eae2dba5bb1fa2993115ff7d8aeded
diff --git a/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
deleted file mode 100644
index 7769c96d3107..000000000000
--- a/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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 static-libs"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-auth/libfprint:0
-	sys-auth/polkit
-	pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )
-"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(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 "${D}" -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.90.8.ebuild b/sys-auth/fprintd/fprintd-1.90.8.ebuild
index 2fd9c7e7f03d..8063672e0390 100644
--- a/sys-auth/fprintd/fprintd-1.90.8.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.8.ebuild
@@ -9,9 +9,9 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild
new file mode 100644
index 000000000000..0dfa760969cd
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.90.9.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 ~ia64 ~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 91a72ded097f..3479f4f0534a 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-	<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
+	</upstream>
 </pkgmetadata>