gentoo resync : 25.08.2020

3 files changed, 34 insertions, 7 deletions

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 5645c9406ffd..75e00d3d5e04 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,4 +1,5 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
-DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
-EBUILD cyberjack-3.99.5_p14.ebuild 1950 BLAKE2B 92c1ac90af31182ede791bca864e48a1d703ca105b06b804ee8201662efe4a9ab7b3d76d3671b1dfd8b6246ac935295fb80bba5f33da065e61274b3e9a6ef93a SHA512 4a50cd74805265cda12a2a8737f57c403f1fdd204daa405e36d7173b6b0d6eff70ac087904c28737867886148ec85c5a23c7d77292ad7e1190ed92cc41a27258
+AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
+DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
+EBUILD cyberjack-3.99.5_p14-r2.ebuild 1946 BLAKE2B 4b0cc5fc8fe4311f257ff91855f84fcbd49ddbff7668dd12442f732ba1adaffa1fe75a3399da21dc5bf58ea3c9d5ec7beba91121a85d85fabb285260097f3ca3 SHA512 5bea615f670c3f775d0fea640803c1d0bd8ffc9ede53e1b82781901c21f22523aa7038027b2fc1e5c206d2a9f3f35ab15dffbd4696ce1feaad84855e8887823c
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
index eb2bb547afb8..5ca837df4452 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 MY_PN="pcsc-${PN}"
 MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}_${MY_PV}"
 
-inherit autotools flag-o-matic linux-info toolchain-funcs udev
+inherit autotools flag-o-matic toolchain-funcs udev
 
 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
+SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
@@ -30,7 +30,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P/_/-}"
 
-CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
 PATCHES="${FILESDIR}/${P}-gcc10.patch"
 
 src_prepare() {
@@ -77,7 +76,7 @@ src_install() {
 	default
 
 	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
-	use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules
+	use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev-r1 99-cyberjack.rules
 
 	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
 
diff --git a/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1 b/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1
new file mode 100644
index 000000000000..49a447859034
--- /dev/null
+++ b/dev-libs/cyberjack/files/libifd-cyberjack6.udev-r1
@@ -0,0 +1,27 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0412", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0485", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0503", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0506", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0507", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0525", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0580", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2000", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0551", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2002", ENV{PCSCD}="1"
+
+# All done
+LABEL="cyberjack_rules_end"