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

5 files changed, 63 insertions, 242 deletions

diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index d392554ed596..d61ff274761c 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,10 +1,9 @@
-AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 AUX libfprint-1.94.1-test-timeout.patch 537 BLAKE2B 5010eac973ade5c5cf48e50355da33f83042c8f7a7d9bc2d88533cc0aa746aec33f0977442e79ff11a58682104d73c5d0dedb0c31564cf9def9af2c73abc2fd6 SHA512 a9d87b681e92be2a81a42d2a68642d4be8479da11b22b5dfd145b21a08ea863f3bc73557259f3c4592128f7000ccb26c6530aa84aebc49303ee0cd3d4aa81147
 AUX libfprint-1.94.4-stderr-redefinition.patch 928 BLAKE2B e23caf122c169f93307cd5137402470fa6bbb29719fb703e971daf742d3866c9403972adec3e678d4f6aa9eeabc2a07a565235843b3cf7921c54f7a912b73041 SHA512 e7d4914005867365c67d9e8d9a3ce1528e7471feb6ad34e2e0e98d44420a2359a5e39b5fdd1613ed937d0425ba61e666bf98b9e9a3b0462b1ddf2ae28fabe322
-DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
 DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
-EBUILD libfprint-1.0.ebuild 1065 BLAKE2B 2ae136498e5facd6d430d939a355022aa40ad67b892ff2271c67b7f4f19bc7729d58bc6c38ce715f1470ba75154f35133973738c3b37be3ff23b7ea9b09c5750 SHA512 12d4ddb9ed752dc1f0cdd8343a09b8a5d3d9d8068b74dc300c99794c2c17b2935a4844640f17af5b943ff37b8183a778555fe8987f50d6a5f9b6ab2331ac6c0e
+DIST libfprint-1.94.5.tar.bz2 8922994 BLAKE2B b79292dc77426d76e5e9cb1cbf8662867224f19ff9cf2434d000689d02e7d4609c9ca94a016185f71500e4a58e9522a7647684e1eaa841c02a40f27e0d22055e SHA512 6a73b3d05bd61b5c74e64d52eba7dab6e97dcf149e32c882e05f15dc7241fd8e78f115957ed52a9657ff0b21642ec633c27cc905cbd4697ed41369508957c989
 EBUILD libfprint-1.94.3.ebuild 1388 BLAKE2B 548dbde6c835bcbeff3b31daf812a9cd926f2df1b052bad503bbdbf4aaa32a3ad20723701105deaae14e2c1775994335fe748fe37becc92ebb81d11e48529d98 SHA512 aa9e8f5570e8daa2c4881d5eedb5b45c8879a42b32da79c7f274488c4a28e4662f7648ab59c6ec474ce0b7fec78e377e353e096d79fe1bd001ada43111b5ce9e
 EBUILD libfprint-1.94.4.ebuild 1353 BLAKE2B c902b55abb64b593cca8e470bbe7e24993e4797c52161630af81b74a9c505e9f14a15c0900e5061ba17fa3de06ef76cadf174cd6033e1f3ddd4f6dbbecba3a2e SHA512 7854dcdf24ee6ac1afec718759ef0297e39647b35ede7a268a1dd4a941e3dcee7a08b8592ba5869968f8e532b19de6122e5a1fcde9b71e19584425b9784baeaa
-MISC metadata.xml 275 BLAKE2B 20edfbe69300bfaf17dcd8e55ed6576d69e44c4e41a27a6211eb613b1bef6e97b0ccca036d9a55ff318faa6ff0679fa387d115109935a4e144fa3dc9c0aaf847 SHA512 9d3975cfeeb4e4e3101c291081d5da73124002d03f016f8ac79931cbba20d3c28d7a08769b4c845cd8d8a2d9be537b68f429fe3691136f851b01bb8b5233f406
+EBUILD libfprint-1.94.5.ebuild 1297 BLAKE2B c49a306e455006308ae6e9606c931f4f260e3dff04eca3d5332d61b3a568bb4ec22a846ec1f713e5780abc5405eba28325b0a2d092f7b318c9b649c1e3579051 SHA512 26ee3f76c99cb718fb46af845ac6fbff4b0f098712bb441022360de1ae68e4b1b66e163c5f936815ddc6b32e1dfde5f414dc882ef0b56b12d83f7c2e1d1ac548
+MISC metadata.xml 346 BLAKE2B 54a3a50cd32196635fac291bfb7f97d50081ca48cbe69df0b94dace16f2b5deae07020f417898d9ca30804cc3f971f093bea5313f9cc4ce8ec6625abe6b12426 SHA512 886d673717825d64b20a63e247ba7d4451d8d15607c6fdff94cbd02f3e5dc1d4d4d6954b92b2df5f09365db80eb4d01a0acc22bc5b977c01f3b45f574e35220a
diff --git a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
deleted file mode 100644
index 15b49597238c..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 17cbe376872d8a0f579a0497942a5d2f19facaf5 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sun, 2 Sep 2018 17:20:03 +0300
-Subject: [PATCH] Fix implicit declaration warnings
-
----
- libfprint/drivers/aes1610.c    | 2 ++
- libfprint/drivers/aes2501.c    | 2 ++
- libfprint/drivers/aes2550.c    | 2 ++
- libfprint/drivers/aesx660.c    | 2 ++
- libfprint/drivers/etes603.c    | 2 ++
- libfprint/drivers/upeksonly.c  | 2 ++
- libfprint/drivers/upektc.c     | 2 ++
- libfprint/drivers/upektc_img.c | 2 ++
- libfprint/drivers/upekts.c     | 2 ++
- libfprint/drivers/vfs0050.c    | 2 ++
- libfprint/drivers/vfs101.c     | 3 +++
- libfprint/drivers/vfs301.c     | 3 +++
- libfprint/drivers/vfs5011.c    | 2 ++
- 13 files changed, 28 insertions(+)
-
-diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
-index f307a3b..9dc3383 100644
---- a/libfprint/drivers/aes1610.c
-+++ b/libfprint/drivers/aes1610.c
-@@ -25,6 +25,8 @@
- 
- #define FP_COMPONENT "aes1610"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- 
-diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c
-index 87879a4..caaf3ea 100644
---- a/libfprint/drivers/aes2501.c
-+++ b/libfprint/drivers/aes2501.c
-@@ -23,6 +23,8 @@
- 
- #define FP_COMPONENT "aes2501"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "aes2501.h"
-diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
-index ab4acaa..c838e54 100644
---- a/libfprint/drivers/aes2550.c
-+++ b/libfprint/drivers/aes2550.c
-@@ -23,6 +23,8 @@
- 
- #define FP_COMPONENT "aes2550"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aes2550.h"
- #include "aeslib.h"
-diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
-index e443e21..17c0245 100644
---- a/libfprint/drivers/aesx660.c
-+++ b/libfprint/drivers/aesx660.c
-@@ -23,6 +23,8 @@
- 
- #define FP_COMPONENT "aesX660"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "aesx660.h"
-diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c
-index fdaf7f2..0782f9e 100644
---- a/libfprint/drivers/etes603.c
-+++ b/libfprint/drivers/etes603.c
-@@ -35,6 +35,8 @@
- 
- #define FP_COMPONENT "etes603"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "driver_ids.h"
- 
-diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c
-index 9cccb86..e035408 100644
---- a/libfprint/drivers/upeksonly.c
-+++ b/libfprint/drivers/upeksonly.c
-@@ -25,6 +25,8 @@
- 
- #define FP_COMPONENT "upeksonly"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "upeksonly.h"
- 
-diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
-index ffa31f3..e4d7de5 100644
---- a/libfprint/drivers/upektc.c
-+++ b/libfprint/drivers/upektc.c
-@@ -20,6 +20,8 @@
- 
- #define FP_COMPONENT "upektc"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "upektc.h"
- 
-diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
-index f0f2f18..a500623 100644
---- a/libfprint/drivers/upektc_img.c
-+++ b/libfprint/drivers/upektc_img.c
-@@ -19,6 +19,8 @@
- 
- #define FP_COMPONENT "upektc_img"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "upektc_img.h"
-diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
-index b448e36..1094e66 100644
---- a/libfprint/drivers/upekts.c
-+++ b/libfprint/drivers/upekts.c
-@@ -27,6 +27,8 @@
- 
- #define FP_COMPONENT "upekts"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- 
- #define EP_IN (1 | LIBUSB_ENDPOINT_IN)
-diff --git a/libfprint/drivers/vfs0050.c b/libfprint/drivers/vfs0050.c
-index dcf5d69..60a720e 100644
---- a/libfprint/drivers/vfs0050.c
-+++ b/libfprint/drivers/vfs0050.c
-@@ -19,6 +19,8 @@
- 
- #define FP_COMPONENT "vfs0050"
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs0050.h"
- 
-diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
-index 3304b1f..473adf2 100644
---- a/libfprint/drivers/vfs101.c
-+++ b/libfprint/drivers/vfs101.c
-@@ -19,6 +19,9 @@
- 
- #define FP_COMPONENT "vfs101"
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "drivers_api.h"
- 
- /* Input-Output usb endpoint */
-diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c
-index a34ee31..6f52316 100644
---- a/libfprint/drivers/vfs301.c
-+++ b/libfprint/drivers/vfs301.c
-@@ -21,6 +21,9 @@
- 
- #define FP_COMPONENT "vfs301"
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs301_proto.h"
- 
-diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
-index 8b460ac..1355394 100644
---- a/libfprint/drivers/vfs5011.c
-+++ b/libfprint/drivers/vfs5011.c
-@@ -18,6 +18,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs5011_proto.h"
- 
--- 
-2.16.4
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
deleted file mode 100644
index d3873860d2fb..000000000000
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/glib:2
-	 dev-libs/nss
-	 virtual/libusb:1=
-	 x11-libs/gtk+:3
-	 x11-libs/pixman
-	 x11-libs/libX11
-	 x11-libs/libXv"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-util/gtk-doc
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			-Dx11-examples=$(usex examples true false)
-			-Ddrivers=all
-			-Dudev_rules=true
-			-Dudev_rules_dir=$(get_udevdir)/rules.d
-			--libdir=/usr/$(get_libdir)
-		)
-		meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.94.5.ebuild b/sys-auth/libfprint/libfprint-1.94.5.ebuild
new file mode 100644
index 000000000000..13f4c1ce816b
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.94.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson udev
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples gtk-doc +introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev
+	dev-libs/nss
+	dev-python/pygobject
+	dev-libs/libgusb
+	x11-libs/pixman
+	examples? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? (
+		dev-libs/gobject-introspection
+		dev-libs/libgusb[introspection]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples gtk-examples)
+		$(meson_use gtk-doc doc)
+		$(meson_use introspection introspection)
+		-Ddrivers=all
+		-Dudev_rules=enabled
+		-Dudev_rules_dir=$(get_udevdir)/rules.d
+		--libdir=/usr/$(get_libdir)
+	)
+
+	meson_src_configure
+}
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index ad11a1045644..9e7ea48833c1 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="freedesktop-gitlab">libfprint/libfprint</remote-id>
 		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
 	</upstream>
 </pkgmetadata>