gentoo resync 08.09.2018

3 files changed, 37 insertions, 3 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 0be7470512da..d34729be8519 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,10 +1,10 @@
 AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
-AUX opensc-0.18.0-build.patch 2053 BLAKE2B 6b5d90a5290b5366a75e299ff55e64924a12e900eedd8aa66b835624c8d5e3b037ddadc72d1f423d24bd31a97320876e024c0698156ed341688fd8ddeb1f45d5 SHA512 05ccaad103f5ccfe82261a258d3d16f2a948a284aafc28b0902b00b43795b9aaa12454823d27b3a981ea8d499db1e4dfaa2e4ea2ca1f9692ac1d33470a82e20a
+AUX opensc-0.18.0-build.patch 3060 BLAKE2B 4716e3cef86eca1da01f479909f21e23b362870eca9a9f44d391e5b0ea0b1fd5d04cc4cac2f681e3ea5325c366a154b919a34f827d6b85d92cc462f9b3832116 SHA512 3d70a8483b96a2ab0cee7c4eb9c71ce1429ef6bf5dbee65f685ec8f21b4c3f7b822e2b7011f420beca957f2ffbdb5726ec52350e2ae92c26c718fc0c421d953e
 AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe
 DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
 DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e
 EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4
-EBUILD opensc-0.18.0.ebuild 1497 BLAKE2B 50d99d8c463ae0b49415070fec5510999bc581ae09c1a8417366c842af3514a53a2d7844b1327328fa9893a4919f0e631353ce63cd10da5d761958e64c3908e5 SHA512 cea13e5a0f4de7713e8ee72a7427a9e62d7638aca82031964b8b4c062071884cbf5c21597b32673f09a8ab0283913d503428cbba0f4069da2b0bcd1de221e98e
+EBUILD opensc-0.18.0.ebuild 1496 BLAKE2B ca71d1b5c5e679d1b8bdc3e424cc6b5c46a4611c2ec6e7a2b2435eb017f788ef0ebcbfefdac73b07ef5e2793371a8e9579bdaf2ef864a1e39b07b2ed44c208b7 SHA512 54555a9f3e0c80913c90cbd8403ec7f912fef4502f4052c66328841c017be2a284bea580cabd4fd7ba87fd1799f98f3f495df5b45fe00594632e72997d349699
 MISC metadata.xml 1164 BLAKE2B d512f5bb01592e7f864a09e7d537a94e89ac2226be34fa999d746701e3b0b9fc8495700f5dc6ec1c866ec9f2fa59ed23d737de53204e4cbc401eca176d1a8ac6 SHA512 eae0e3d7c795c452f65730138d867bff881778d9615b1cea1aba362d374e4d8ae8949d01204ce14bb8ea80021ca3328cb2657f3e25b95b93a7848e76f577c761
diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch
index 342abd83eb01..1db749ca654e 100644
--- a/dev-libs/opensc/files/opensc-0.18.0-build.patch
+++ b/dev-libs/opensc/files/opensc-0.18.0-build.patch
@@ -64,3 +64,37 @@ index e85dfc45..13b0cc21 100644
 -- 
 2.16.4
 
+From 0f7af8a647a8fca6b1f1ee2327c3d26bed38c8f6 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 8 Sep 2018 00:16:57 +0300
+Subject: [PATCH] reader-ctapi: ctapi_connect: remove unused variable
+
+from day 1 return value of _sc_parse_atr was ignored.
+---
+ src/libopensc/reader-ctapi.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
+index 8d4c1c24..4b94337f 100644
+--- a/src/libopensc/reader-ctapi.c
++++ b/src/libopensc/reader-ctapi.c
+@@ -239,7 +239,6 @@ static int ctapi_connect(sc_reader_t *reader)
+ 	char rv;
+ 	u8 cmd[9], rbuf[256], sad, dad;
+ 	unsigned short lr;
+-	int r;
+ 
+ 	if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE)
+ 		return SC_ERROR_NOT_ALLOWED;
+@@ -265,7 +264,7 @@ static int ctapi_connect(sc_reader_t *reader)
+ 		return SC_ERROR_INTERNAL;
+ 	reader->atr.len = lr;
+ 	memcpy(reader->atr.value, rbuf, lr);
+-	r = _sc_parse_atr(reader);
++	_sc_parse_atr(reader);
+ 
+ 	return 0;
+ }
+-- 
+2.16.4
+
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
index 5572f8c5297d..2d33364c868f 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )