gentoo resync : 21.06.2020

3 files changed, 17 insertions, 9 deletions

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 72aac36feb44..cd62e4bfa882 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,6 @@
+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
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
 EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
-EBUILD cyberjack-3.99.5_p14.ebuild 2076 BLAKE2B 98a47e796c0cd1fffc15d4130390e3ca2db53722fe5414aad35cf1fe2cb7803dddd91851b8be0f99e760f3e7a1206937a876789168f4899b17f87abe06c749cf SHA512 7d71bb42bfdaccb82bf815b324cf2a69e1aa7166890b7024e8f6fc81119fdb97367b778b2ba80721680ed1af0b0c49bb26ae2299c645e21e52428a9ff7c3c679
+EBUILD cyberjack-3.99.5_p14.ebuild 1951 BLAKE2B f942b44b30284cbd3057c260df7aadb3de3e141c3ff5d16b8a9356e76496e6f5d5056123115245de62e442957ba1cabb2b5ef63ef4dc1aea8aad834f971c2fa6 SHA512 5643599f37a04cf0c9d501c17ea023a1df22157a91c1c3cf17067e89b2ff5a469973c1a6d10b011a85aa944bf541c32e4e12e41251c5feddc4c3c28ea143f73e
 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.ebuild
index 53d0aee2a30f..bc4e83876eeb 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
@@ -13,7 +13,7 @@ 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"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev +usb xml"
@@ -31,13 +31,7 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P/_/-}"
 
 CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-
-pkg_setup() {
-	# Add workaround for GCC-10,
-	# by defining narrowing as warning like GCC-9 did.
-	# Upstream is working on that.
-	append-cxxflags -Wno-narrowing
-}
+PATCHES="${FILESDIR}/${P}-gcc10.patch"
 
 src_prepare() {
 	default
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch
new file mode 100644
index 000000000000..a91ee2e2ba42
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch
@@ -0,0 +1,13 @@
+Fixes compilation with GCC10.
+
+--- a/ifd/ifd.cpp
++++ b/ifd/ifd.cpp
+@@ -958,7 +958,7 @@
+   else
+     l_atrLength=0;
+   rj=r->IfdPower(mode, Atr, &l_atrLength);
+-  switch (rj) {
++  switch (static_cast<NTSTATUS>(rj)) {
+   case STATUS_SUCCESS:
+     DEBUGLUN(Lun, DEBUG_MASK_IFD, "Success (ATR: %d bytes)\n", (int)l_atrLength);
+     rc=IFD_SUCCESS;