gentoo resync : 20.03.2022

3 files changed, 32 insertions, 1 deletions

diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index f9614c2c3d47..289537d1e1e4 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,6 +1,7 @@
 AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990
 AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
+AUX pcsc-lite-1.9.5-no-libusb-udev.patch 1271 BLAKE2B dcf1cf8e70446ec0ee19cf17edf66372e2feea817ffb822bd0bf656c3e310df752d85be0dbbb43680a0ba3ec45c3846a97465ef2b82ee3b53c88aac00cf9a174 SHA512 de3d1cf4dff39a7499337a6e915a3d3813a8840299a8851b24afd847aa184f38b51f76bac7fc1161011d1c4d047c195609e54e07f541502f8cf205a0e95f314c
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
@@ -10,5 +11,5 @@ DIST pcsc-lite-1.9.5.tar.bz2 775736 BLAKE2B 2e42fa3864ec68725f90338ae981c758328c
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
 EBUILD pcsc-lite-1.9.4.ebuild 3182 BLAKE2B d1f81f1ff0e2b317847aaf59e32afcb17a813fff04a7326b6d5c1cc4f91b6775de01674e15f3a773d565d986caa7c585df7e807ff3e450e6c17d62a62172e376 SHA512 0b1d4de95dfabcbbc958e38f5e07551cf0fd59674a23027c0dbeb8d237356d4dd928bcc444aea8dc7fd090d6beea6fb321b9eea9883b28d4ac658c7d3a3151b6
-EBUILD pcsc-lite-1.9.5.ebuild 3182 BLAKE2B 80667a0b15e3b822588735bbd17e4d0dea50a518496becb7f4f9fb8252f51fb851d3a03e2b22fa63e4cac354eb9b3311a2905be8c5f3e28d8ee7fdb43d6fff1f SHA512 03fb0b28457f42c7f8f883d75240c7c6e5d8c508fa195d5cd483b08e5986420537a162dd968991e7cda1f80e09e5d8f0b65649181137486b422bee0b1f01b576
+EBUILD pcsc-lite-1.9.5.ebuild 3223 BLAKE2B b34beae2ce30217c22aebbc645e523cc8a8ea7e19b4a102f040cedc4cbe00c75b5e958f147db98b089a1ece9021aa3c4b56fb59f3489926ed9a34ad79b1ae6c7 SHA512 956396329fafcda0b5397dcfdebf48a68447b0bbe71acbb1c1637ba8ffb540bd4dda2161231b18b19595562f8bc00aafb0fbca776819195d1bac127e83877595
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
new file mode 100644
index 000000000000..2f4793b03fb4
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
@@ -0,0 +1,29 @@
+https://github.com/LudovicRousseau/PCSC/commit/a4bdfd2eb6e908c8306fe421137a83573ba05d8c
+https://bugs.gentoo.org/832593
+
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 14 Dec 2021 08:20:59 +0100
+Subject: [PATCH] src/hotplug_generic.c: fix build without lib{udev,usb}
+
+Fix the following build failure without lib{udev,usb} raised since
+version 1.9.5 and
+https://github.com/LudovicRousseau/PCSC/commit/6f8f170db3c88c59a5ddb5ae5319b921a901a6aa:
+
+/home/giuliobenetti/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pcscd-pcscdaemon.o: in function `signal_thread':
+pcscdaemon.c:(.text+0x444): undefined reference to `HPReCheckSerialReaders'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/6cf323229f32967aa554418410dc94b7094d09af
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+--- a/src/hotplug_generic.c
++++ b/src/hotplug_generic.c
+@@ -48,7 +48,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define FALSE 0
+ #endif
+ 
+-#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) && !defined(HAVE_LIBUDEV)
++#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUDEV)
+ 
+ LONG HPSearchHotPluggables(void)
+ {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
index 0f45e4dc5bb1..147fd36f5bc0 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
@@ -42,6 +42,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+	"${FILESDIR}"/${P}-no-libusb-udev.patch
 )
 
 DOCS=( AUTHORS HELP README SECURITY ChangeLog )