gentoo auto-resync : 04:06:2024 - 00:07:50

5 files changed, 114 insertions, 125 deletions

diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index e84a5a2a6169..2ae27d951336 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,11 +1,8 @@
 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.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
+AUX libfprint-1.94.7-skip-test-dep.patch 3575 BLAKE2B fc770660b819251ddf9f2e3abc804e7a374d6bb1172b1c0692eb513f682e812ec3428403573543c710e83a2bf57c6d863d1b241f74c1f2580ab620ae35a35f7a SHA512 f16e54e825021252dd09dc189a926c4549b65677526da46a97766c39acaa744f5598040705700ba5e1dfee209001c092143fe82a22bbb13ce60e5369a6dd9805
 DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
-DIST libfprint-1.94.5.tar.bz2 8922994 BLAKE2B b79292dc77426d76e5e9cb1cbf8662867224f19ff9cf2434d000689d02e7d4609c9ca94a016185f71500e4a58e9522a7647684e1eaa841c02a40f27e0d22055e SHA512 6a73b3d05bd61b5c74e64d52eba7dab6e97dcf149e32c882e05f15dc7241fd8e78f115957ed52a9657ff0b21642ec633c27cc905cbd4697ed41369508957c989
 DIST libfprint-1.94.7.tar.bz2 9066931 BLAKE2B 5df859c4e38a8016b8f91785d8634d85e023cc19b837e928dd2de6392ed77b7a82c26e6c1485df2fa1fb2041421d4dd05441d5df24c2fc5399783dcc174d5afc SHA512 b91a71ef998b03a64b08d9439a1d26027f196f07fd1344bbe45f2dbeb3ace5752af9b7504ee8537eb40d896e43a517e3759a7b3735baded4cc3fb6c0ca3b0ece
-EBUILD libfprint-1.94.3.ebuild 1388 BLAKE2B 548dbde6c835bcbeff3b31daf812a9cd926f2df1b052bad503bbdbf4aaa32a3ad20723701105deaae14e2c1775994335fe748fe37becc92ebb81d11e48529d98 SHA512 aa9e8f5570e8daa2c4881d5eedb5b45c8879a42b32da79c7f274488c4a28e4662f7648ab59c6ec474ce0b7fec78e377e353e096d79fe1bd001ada43111b5ce9e
 EBUILD libfprint-1.94.4.ebuild 1351 BLAKE2B c285fdec8fb854dcdb37f6c4643500737aef2e65ea1872e3d899360bc47cd9a25024fbdf00415627440ff822d0f649201f2cbf3eb63fc5653ec148fa674de102 SHA512 0bd34ceb88f728e362761a084d6373ca1f2974f44be8e2f21b0bdf47ee540bf3235daebb60d3293fbb78e501d6ac26ed4e8e0bd75ee0efea47f0efae5e1b99e5
-EBUILD libfprint-1.94.5.ebuild 1297 BLAKE2B fc6bea9e1445fa7247c56d254bbfabb185b41972611ea277711dee778555b8d8ab06ef4bb0dad8453450e29b1836fa151498854f5795d7765ee0547b506ce400 SHA512 f754042b136883f7af709a4afaa2cc17b3984c382bf49fcfa39633ce71223d7b3d5a4fb4b4e5f9e7edd717c5a672577da511df9dfe403525ef3205dc164ee1db
-EBUILD libfprint-1.94.7.ebuild 1368 BLAKE2B 4b5476c9f6c257aa7303d7358e574688cbf9e3836235ad4c10a129f4a2ff445a87da07569828117e88aefcd6942420e5f752c60f81b708196a04421f02e03ef7 SHA512 08579aa375ff9b57b8b9cb484a5e688cae6e93eb04a32f8619a549bf1babf8631f31369f0e525402bfce0ba77a2be9cf8c278aa00ebc6cc534ddcb2eb967cb9a
+EBUILD libfprint-1.94.7.ebuild 1506 BLAKE2B c1a3d65a3aa55f4c1a1ed43bb3a4f02832aed2c6cd8772a3e307a68c3a561c6c3f87c27c613d66fbd085789e1d29a812bc24ba7965279e94f2b6fba60ec90e2a SHA512 e0efa9875f9db887e1c4dcf3390521fa05d6412186424a025189b26c0fd41e0cb28266a9ef20a1fd77582f6dcc2c44ba41ab33fab6b6cca2a70017d0d9659105
 MISC metadata.xml 407 BLAKE2B c8ed6e1eefe8594b63e8e84fb86ab0da9dceb8c2371d7251669663ea56ed964586a153238ec2ed6d2ebbc3d4f6463c6b3a0974381f4a3c4f493e51d36bd301e6 SHA512 0aa9194056fe139745d821dffd0367db8e92c9e9d4e4dc1067a8427515cc3c48c588fe43b49232c999a34024b6be1217daeb9c0d5d100d25d0f31c744efe80e6
diff --git a/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch
new file mode 100644
index 000000000000..7d2d6b20ecff
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch
@@ -0,0 +1,106 @@
+https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/4b72f27de6706a6001e82b477b647ced30cc37b5
+https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/7dbb21e77ace03bf28dc9a6b37b43d551282389f
+
+From 4b72f27de6706a6001e82b477b647ced30cc37b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Tue, 20 Feb 2024 08:22:42 +0100
+Subject: [PATCH] build: Look for sh just once
+
+---
+ meson.build       |  1 +
+ tests/meson.build | 10 +++++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 435827ce..28ee27a2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -91,6 +91,7 @@ gusb_dep = dependency('gusb', version: '>= 0.2.0')
+ mathlib_dep = cc.find_library('m', required: false)
+ 
+ # The following dependencies are only used for tests
++sh = find_program('sh', required: true)
+ cairo_dep = dependency('cairo', required: false)
+ 
+ # introspection scanning and Gio-2.0.gir
+diff --git a/tests/meson.build b/tests/meson.build
+index f68ed406..8c8f5d07 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -151,7 +151,7 @@ if get_option('introspection')
+             endif
+         else
+             test(vdtest,
+-                find_program('sh'),
++                sh,
+                 args: ['-c', 'exit 77']
+             )
+         endif
+@@ -205,7 +205,7 @@ if get_option('introspection')
+             endif
+         else
+             test(driver_test,
+-                find_program('sh'),
++                sh,
+                 args: ['-c', 'exit 77']
+             )
+         endif
+@@ -224,13 +224,13 @@ if get_option('introspection')
+ else
+     warning('Skipping all driver tests as introspection bindings are missing')
+     test('virtual-image',
+-        find_program('sh'),
++        sh,
+         args: ['-c', 'exit 77']
+     )
+ 
+     foreach driver_test: drivers_tests
+         test(driver_test,
+-            find_program('sh'),
++            sh,
+             args: ['-c', 'exit 77']
+         )
+     endforeach
+@@ -273,7 +273,7 @@ foreach test_name: unit_tests
+             # Create a dummy test that always skips instead
+             warning('Test @0@ cannot be compiled due to missing dependencies'.format(test_name))
+             test(test_name,
+-                find_program('sh'),
++                sh,
+                 suite: ['unit-tests'],
+                 args: ['-c', 'exit 77'],
+             )
+-- 
+GitLab
+
+From 7dbb21e77ace03bf28dc9a6b37b43d551282389f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Tue, 20 Feb 2024 08:24:12 +0100
+Subject: [PATCH] build/tests: Skip a test if the test requires it during
+ inspection
+
+In case we don't have dependencies, we should skip the test, otherwise
+we can just fail at test time
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -100,11 +100,17 @@ if get_option('introspection')
+             base_args = files(vdtest + '.py')
+             suite = ['virtual-driver']
+ 
+-            r = run_command(unittest_inspector, files(vdtest + '.py'), check: true)
++            r = run_command(unittest_inspector, files(vdtest + '.py'), check: false)
+             unit_tests = r.stdout().strip().split('\n')
+ 
+             if r.returncode() == 0 and unit_tests.length() > 0
+                 suite += vdtest
++            elif r.returncode() == 77
++                test(vdtest,
++                    sh,
++                    args: ['-c', 'exit 77']
++                )
++                continue
+             else
+                 unit_tests = [vdtest]
+             endif
+-- 
+GitLab
diff --git a/sys-auth/libfprint/libfprint-1.94.3.ebuild b/sys-auth/libfprint/libfprint-1.94.3.ebuild
deleted file mode 100644
index e08911022880..000000000000
--- a/sys-auth/libfprint/libfprint-1.94.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson udev
-
-DESCRIPTION="Library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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/libgusb
-	dev-libs/nss
-	virtual/libusb:1=
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/pixman
-	!>=sys-auth/libfprint-1.90:0
-	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}-0.8.2-fix-implicit-declaration.patch
-	"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use examples gtk-examples)
-		$(meson_use gtk-doc doc)
-		$(meson_use 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/libfprint-1.94.5.ebuild b/sys-auth/libfprint/libfprint-1.94.5.ebuild
deleted file mode 100644
index f60ff3e9d76e..000000000000
--- a/sys-auth/libfprint/libfprint-1.94.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 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 ~loong 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/libfprint-1.94.7.ebuild b/sys-auth/libfprint/libfprint-1.94.7.ebuild
index 7ece93fa19d2..bedb3c55755b 100644
--- a/sys-auth/libfprint/libfprint-1.94.7.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.7.ebuild
@@ -43,11 +43,16 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.94.1-test-timeout.patch"
+	"${FILESDIR}/${PN}-1.94.7-skip-test-dep.patch"
+)
 
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
+	# TODO: wire up test deps (cairo, pygobject, etc) for extra tests
+	# currently skipped.
 	local emesonargs=(
 		$(meson_use examples gtk-examples)
 		$(meson_use gtk-doc doc)