gentoo resync : 05.04.2019

6 files changed, 7 insertions, 226 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index abca036f37b1..0b37498bbc11 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,13 +1,8 @@
-AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
 AUX opensc-0.18.0-build.patch 3060 BLAKE2B 4716e3cef86eca1da01f479909f21e23b362870eca9a9f44d391e5b0ea0b1fd5d04cc4cac2f681e3ea5325c366a154b919a34f827d6b85d92cc462f9b3832116 SHA512 3d70a8483b96a2ab0cee7c4eb9c71ce1429ef6bf5dbee65f685ec8f21b4c3f7b822e2b7011f420beca957f2ffbdb5726ec52350e2ae92c26c718fc0c421d953e
 AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe
 AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0
-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
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
-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 1503 BLAKE2B cae3cd5dafd6c2c87785ef9518cc5b7e3564feec31ef29da8bd35a0180eae13291d18484921a8f4e060e3495ca4ccbe5a63ae02b711bb059b1eb5541ad9789b7 SHA512 1975af57c5c3e11fe90832b2518fbe72e782bb58260f9f87c7aa64d5c5f53180f07c5e95a9ed10daa8ad41501a342ab4af23c5140ef2750db12cb4febcbf3a27
-EBUILD opensc-0.19.0-r2.ebuild 1640 BLAKE2B 0f460a63abe2d9a86e0a8e19983e66c3dd2981d656621df3729ee1b15ba05e35442aef931b2c1e65f1d9b53b5f914c0a930efdbe8fa6865ebe574f7a34ac6b5e SHA512 b4b85ad084c39a571413d7d218d09b7992b5bb99890d29d0b813e0e261e5e945b4e56adb99f234ee1ea6aafdec9a17bb3a4e03fb599856670f34b9f19debf2d9
+EBUILD opensc-0.18.0.ebuild 1499 BLAKE2B 6908def240f76d09456dc5b3e937d660fc566284a1477973a5ce474833f9e3dc4c851fbf53ebf6b58f608681b93d37e7cb083ff476bbd04eab4445d5771169a1 SHA512 7f4797929355f08bb430b28f6e1cbda6be61d4ca3ba2af0003be67b18809c01d995133868632650debde80541c7f76e06e1f7e514c22fe7a059f3f2d134efa5b
+EBUILD opensc-0.19.0-r2.ebuild 1657 BLAKE2B bb055802875c7edd591530865c7c4ae758e4dfa821f2247005f06cbe4fb8dda4fa2ad570852190b51a8a1bf2fed3651486aa1a7dd5ce1719c946d9b1413ea3ff SHA512 f87536806841cc5e9a261fed82a837ad986642b3e8a30c32ce8a592fcc4b80c1d5e03748aa0e777fbc3e3ebde1569cabfc03772e836f4c88c97a636c4648385a
 MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e
diff --git a/dev-libs/opensc/files/opensc-0.17.0-build.patch b/dev-libs/opensc/files/opensc-0.17.0-build.patch
deleted file mode 100644
index 8a51d7ac4450..000000000000
--- a/dev-libs/opensc/files/opensc-0.17.0-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 65b302e33b710833d4d14bf8eaf00acdaa436c39 Mon Sep 17 00:00:00 2001
-From: Frank Morgner <frankmorgner@gmail.com>
-Date: Wed, 19 Jul 2017 00:09:36 +0200
-Subject: [PATCH] sc-hsm: fixed building with --disable-sm
-
-Closes https://github.com/OpenSC/OpenSC/pull/1103
----
- src/libopensc/card-sc-hsm.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
-index cfa084a06..1f61e0138 100644
---- a/src/libopensc/card-sc-hsm.c
-+++ b/src/libopensc/card-sc-hsm.c
-@@ -284,7 +284,9 @@ static int sc_hsm_soc_select_minbioclient(sc_card_t *card)
- 	};
- 
- 	/* Select MinBioClient */
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 	sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x0C);
- 	apdu.data = minBioClient_aid.value;
- 	apdu.datalen = minBioClient_aid.len;
-@@ -533,7 +535,9 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
- 	sc_apdu_t apdu;
- 	u8 cmdbuff[16];
-+#ifdef ENABLE_SM
- 	u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-+#endif
- 	int r;
- 	int cmd = data->cmd;
- 	size_t pin2_len = data->pin2.len;
-@@ -563,7 +567,10 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 	if ((card->type == SC_CARD_TYPE_SC_HSM_SOC || card->reader->uid.len
- 				|| cmd == SC_PIN_CMD_GET_SESSION_PIN)
- 			&& (data->cmd != SC_PIN_CMD_GET_INFO)
--			&& card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
-+#ifdef ENABLE_SM
-+			&& card->sm_ctx.sm_mode != SM_MODE_TRANSMIT
-+#endif
-+			) {
- 		LOG_TEST_RET(card->ctx,
- 				sc_hsm_perform_chip_authentication(card),
- 				"Could not perform chip authentication");
-@@ -604,6 +611,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 			data->apdu = &apdu;
- 		}
- 
-+#ifdef ENABLE_SM
- 		if ((data->cmd == SC_PIN_CMD_GET_INFO)
- 				&& (card->sm_ctx.sm_mode == SM_MODE_TRANSMIT)) {
- 			/* JCOP's SM accelerator is incapable of using case 1 APDU in SM */
-@@ -612,6 +620,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 			apdu.resplen = sizeof rbuf;
- 			data->apdu = &apdu;
- 		}
-+#endif
- 
- 		data->pin1.offset = 5;
- 		data->pin1.length_offset = 4;
-@@ -627,11 +636,17 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 		data->cmd = SC_PIN_CMD_GET_SESSION_PIN;
- 		if (data->pin_reference == 0x81) {
- 			u8 recvbuf[SC_MAX_APDU_BUFFER_SIZE];
-+#ifdef ENABLE_SM
- 			if (card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
- 				sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
- 						"Session PIN generation only supported in SM");
- 				LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
- 			}
-+#else
-+			sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
-+					"Session PIN generation only supported in SM");
-+			LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
-+#endif
- 			sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0x5A, 0x01, data->pin_reference);
- 			apdu.cla = 0x80;
- 			apdu.resp = recvbuf;
-@@ -669,7 +684,9 @@ static int sc_hsm_logout(sc_card_t * card)
- 	sc_path_t path;
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
- 	memset(priv->sopin, 0, sizeof(priv->sopin));
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 
- 	sc_path_set(&path, SC_PATH_TYPE_DF_NAME, sc_hsm_aid.value, sc_hsm_aid.len, 0, 0);
- 
-@@ -1586,7 +1603,9 @@ static int sc_hsm_init(struct sc_card *card)
- static int sc_hsm_finish(sc_card_t * card)
- {
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 	if (priv->serialno) {
- 		free(priv->serialno);
- 	}
diff --git a/dev-libs/opensc/opensc-0.16.0.ebuild b/dev-libs/opensc/opensc-0.16.0.ebuild
deleted file mode 100644
index df55b1ce24bc..000000000000
--- a/dev-libs/opensc/opensc-0.16.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-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"
-IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable openct) \
-		$(use_enable ctapi)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/opensc/opensc-0.17.0.ebuild b/dev-libs/opensc/opensc-0.17.0.ebuild
deleted file mode 100644
index 0612c40f2bb0..000000000000
--- a/dev-libs/opensc/opensc-0.17.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-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"
-IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		--disable-static \
-		--disable-openpace \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable openct) \
-		$(use_enable ctapi)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
index a6b6123d08f3..5ecdcca6ed00 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 )
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index 8e68f0328789..70d56a99baa9 100644
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
@@ -44,6 +44,7 @@ src_configure() {
 		--with-completiondir="$(get_bashcompdir)" \
 		--disable-openpace \
 		--disable-static \
+		--disable-strict \
 		--enable-man \
 		$(use_enable ctapi) \
 		$(use_enable doc) \