[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/

["David Seifert" <soap@gentoo.org>]

commit:     823568f4fef6abcbcaef9c7c85d1b5202e2b498f
Author:     Thibaud CANALE <thican <AT> thican <DOT> net>
AuthorDate: Sun Jun  2 10:22:28 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 10:22:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823568f4

sys-apps/pcsc-lite: fix udev rule for pcscd hotplug, #902847

Closes: https://bugs.gentoo.org/902847
Closes: https://github.com/gentoo/gentoo/pull/36964
Signed-off-by: Thibaud CANALE <thican <AT> thican.net>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/{99-pcscd-hotplug-r1.rules => 99-pcscd-hotplug-r2.rules}    | 4 ++--
 .../pcsc-lite/{pcsc-lite-2.0.0.ebuild => pcsc-lite-2.0.0-r1.ebuild}   | 2 +-
 .../pcsc-lite/{pcsc-lite-2.0.1.ebuild => pcsc-lite-2.0.1-r1.ebuild}   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
similarity index 55%
rename from sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
rename to sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
index fc612d5e25f3..218417932aa2 100644
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
@@ -1,6 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We add this here so that it runs after ccid's and ifd-gempc's rules;
 # if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
+ACTION=="add", ENV{ID_SMARTCARD_READER}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"

diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
similarity index 98%
rename from sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
index 661385f197ba..49f41d4e17ea 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
 		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
 
 		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy

diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
similarity index 98%
rename from sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
index 5d5823a7adbb..a3a1b872c2cd 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
 		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
 
 		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy