gentoo resync : 20.03.2021

4 files changed, 13 insertions, 45 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 5ec18c208a6c..0ffed7387a3f 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,6 +1,5 @@
-AUX opensc-0.20.0-gcc10.patch 1132 BLAKE2B 1afde2a2a92c85a1435bf6b2f4cf9d44fec836effb1867c8e28bd4a4b8ec78dbf1d7ea075c77bfa2ff0a585ba62068765a093cfe8925deea4f9c4972bf04930f SHA512 d7cabea0090b6c05ffd5f597261f06afa3ba0f051e1b75f715a6fa50c59cd10663f023f570af8f76532dd5a3bb8a76d5cd6b26872de271e3eadae29c3ba7bd27
-DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
+AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
 DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
-EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 30c0f97f196c780a3097a43ad1f6dc1a57d36fb13ef09a8e409d0798e90399cd1aeb35362f59930e9276983f8329e4d9fc0d3edecb962b003fb545aef1a4b4a1 SHA512 af135d3d845694ccf8e09f460312919f502c321b9bac1adcaf90d3aa9edf8ccea94612413dced2b224465eb8b90c617b5a8a3306081176ef0fe1f3043c3c060b
+EBUILD opensc-0.21.0-r1.ebuild 1708 BLAKE2B b57663a827cbfe31df245625fc43d30963abe463b00b905e7a2bcd8d85a633a710fe20f564511b7e1180ce3df3f4b313e28642452dee1f1712b6cfccec4214e8 SHA512 dd4c4b912dc7465357ffee5c74d6e56ecef4323df10f27d237b8f54303bbaebe74ba3f830b45ac9b072ab8e668fa9a566f35828ce70389202bb0a2c072821752
 EBUILD opensc-0.21.0.ebuild 1644 BLAKE2B da7e509d5adef201397ce549151289f690621c85a4e6b0d93b7f62b3994a251f397a3853d71197dfab103e2e5538924ccce0ac1e99964ccac5d453a46f9fd85a SHA512 3e6da8d3d5eabab456f0033e761d7d017170301551c68c3e4b24520feb24f2624e5725a7b077c61335939b207624f26f554f149b6402f0a9ef304beeda6be938
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
deleted file mode 100644
index f96a1140872e..000000000000
--- a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 10 Feb 2020 15:09:17 +0100
-Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
-
----
- src/tests/p11test/p11test.c        | 3 +++
- src/tests/p11test/p11test_common.h | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
-index feecf6fb42..a16282cba3 100644
---- a/src/tests/p11test/p11test.c
-+++ b/src/tests/p11test/p11test.c
-@@ -34,6 +34,9 @@
- 
- #define DEFAULT_P11LIB	"../../pkcs11/.libs/opensc-pkcs11.so"
- 
-+/* Global variable keeping information about token we are using */
-+token_info_t token;
-+
- void display_usage() {
- 	fprintf(stdout,
- 		" Usage:\n"
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-index 2f3b238de0..9eb5cedecb 100644
---- a/src/tests/p11test/p11test_common.h
-+++ b/src/tests/p11test/p11test_common.h
-@@ -84,7 +84,7 @@ typedef struct {
- 	size_t  num_keygen_mechs;
- } token_info_t;
- 
--token_info_t token;
-+extern token_info_t token;
- 
- #endif /* P11TEST_COMMON_H */
- 
diff --git a/dev-libs/opensc/files/opensc.module b/dev-libs/opensc/files/opensc.module
new file mode 100644
index 000000000000..3246ab4da0a1
--- /dev/null
+++ b/dev-libs/opensc/files/opensc.module
@@ -0,0 +1,8 @@
+# This file describes how to load the opensc module
+# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
+
+# This is a relative path, which means it will be loaded from
+# the p11-kit default path which is usually $(libdir)/pkcs11.
+# Doing it this way allows for packagers to package opensc for
+# 32-bit and 64-bit and make them parallel installable
+module: onepin-opensc-pkcs11.so
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
index 51a8742645f5..7e6fedb42d16 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,10 +36,6 @@ REQUIRED_USE="
 	ctapi? ( !pcsc-lite !openct )
 	|| ( pcsc-lite openct ctapi )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
 src_prepare() {
 	default
 	elibtoolize
@@ -67,4 +63,6 @@ src_configure() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
+	insinto /etc/pkcs11/modules/
+	doins "${FILESDIR}/${PN}.module"
 }