gentoo resync : 07.05.2021

5 files changed, 84 insertions, 4 deletions

diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index d2222ab6d4a0..64afe3b7e273 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,5 +1,7 @@
+AUX openct-0.6.20-automake.patch 786 BLAKE2B f37d39bdbc0c1db10ec7058536d0d34ac3009e7ac2081f36ae9cea3f17f2d0558d50e2062fe60fb808df710887b290683374ada1c9301cb91480d67484008186 SHA512 baf7fae52aea4dae53ed1f3364eab207aeaa3cd2aad28b44dbf05f5632fa27530436a03748c285ed325360b6b62821c685cd0e05713db2f95a3177ba1b5749be
+AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f177e202490c162594aec6559f13c65e562b887e6c8d056c1ce5ab247e80c51ca6610654e61b2c593e7b13e22e458b43a SHA512 34ab2345b44424d9868c95a9af862d03603647b824e1d84a1f35a8171249b2beba7fae9ae3a4d0468d9029cf6c748c02fb2032e30462640eb42ff08d3cdd3868
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1734 BLAKE2B e9e193badd4a5236e18f6adb5ea278edcc7f3458000eca74191310fcbf9cd58dcc18bcd25533f5a0ef848a6545514572ca8c5425b368dcc7b10d689b65cd7fec SHA512 42ab456144313113ee22de1b6e643624f9f8c1a2057feedbf49021cd68e381818ab9e01a8650a9c6612b173b687d69d5cd612515209a3e44a88a7c4db264e51c
-EBUILD openct-0.6.20-r5.ebuild 1725 BLAKE2B a014f0a6706343c5b4b77baf23d1731533029cbd2a07e1ab289a07c95c6d7113df964bbe010e156dce36564c9af34770cfa01e7fa914fce38a4674787e08c575 SHA512 3259da10043b859c7f46f56b869b5c4408abcf2ee305b131a243b703bfbe56fd7f0d50dfdf129b49c68ce07a23ea1e09247369c16b2b14839c98226d768abd26
+EBUILD openct-0.6.20-r4.ebuild 1868 BLAKE2B ebbf993782fcd0d9e1d8d355a7896a85e26660e516c856c33677db34424f28a737f8d30ddbbf3ff292c16cb404247d02d6dd8b3f3d54140e1ba565d4c0fea6cb SHA512 1680b4bcf2ab446a6998af48a5a3abff32860620784403ec240e1962a2fee5163e810e67de601439720ea613f9de5433c007338a6923ee3a2889b440db240dba
+EBUILD openct-0.6.20-r5.ebuild 1859 BLAKE2B 87fee515cdcc320f0e10fbf1b071af52f8dd72e8547670b689a52fe6abcf82a0213c77977c0a4b4d6a0e0f52629a9b7b8a783d5935cb31bff7cfff3575e4f47a SHA512 a26d692b9d2da8ccea128beae188590fe245f8239e9059fad47da1a15a54568aa76c9d0d8852e99dc4866da0cfe470f5062b26661f130edd1deabf3fc26e4480
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/files/openct-0.6.20-automake.patch b/dev-libs/openct/files/openct-0.6.20-automake.patch
new file mode 100644
index 000000000000..451af6a8a50e
--- /dev/null
+++ b/dev-libs/openct/files/openct-0.6.20-automake.patch
@@ -0,0 +1,24 @@
+From 86abf3cbddbdc590dbb2ff5b0bda263e42595b88 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 10 Oct 2012 08:48:02 +0000
+Subject: [PATCH] build: fix issue with latest automake
+
+---
+ etc/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index ff66d4e..dc00f47 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -30,8 +30,8 @@ dist_noinst_DATA += openct.usermap
+ endif
+ 
+ 
+-sysconf_DATA=#required in order to create dir
+-install-exec-hook:	install-sysconfDATA openct.conf
++install-exec-hook:	openct.conf
++	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ 	if [ -f "$(DESTDIR)$(sysconfdir)/openct.conf" ]; then \
+ 		$(INSTALL_DATA) openct.conf "$(DESTDIR)$(sysconfdir)/openct.conf.new"; \
+ 	else \
diff --git a/dev-libs/openct/files/openct-0.6.20-slibtool.patch b/dev-libs/openct/files/openct-0.6.20-slibtool.patch
new file mode 100644
index 000000000000..0c0af2e1bd94
--- /dev/null
+++ b/dev-libs/openct/files/openct-0.6.20-slibtool.patch
@@ -0,0 +1,34 @@
+From f329c2663bde748d4a8fc462a1ea7bbc4ab47b36 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 27 Sep 2013 23:27:24 +0300
+Subject: [PATCH] build: use newer libtool -shared option
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/ctapi/Makefile.am | 2 +-
+ src/pcsc/Makefile.am  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ctapi/Makefile.am b/src/ctapi/Makefile.am
+index 25627a3..c837820 100644
+--- a/src/ctapi/Makefile.am
++++ b/src/ctapi/Makefile.am
+@@ -8,4 +8,4 @@ libopenctapi_la_LIBADD = $(top_builddir)/src/ct/libopenct.la
+ libopenctapi_la_CFLAGS = $(AM_CFLAGS) \
+ 	-I$(top_srcdir)/src/include \
+ 	-I$(top_builddir)/src/include
+-libopenctapi_la_LDFLAGS = -avoid-version -no-undefined --module
++libopenctapi_la_LDFLAGS = -avoid-version -no-undefined -module -shared
+diff --git a/src/pcsc/Makefile.am b/src/pcsc/Makefile.am
+index 9986621..6aff8b8 100644
+--- a/src/pcsc/Makefile.am
++++ b/src/pcsc/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = openct-ifd.la
+ endif
+ 
+ openct_ifd_la_SOURCES = pcsc.c
+-openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined
++openct_ifd_la_LDFLAGS = -module -shared -avoid-version -no-undefined
+ openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_builddir)/src/ctapi/libopenctapi.la
+ openct_ifd_la_CFLAGS = $(AM_CFLAGS) \
+ 	-I$(top_srcdir)/src/include \
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index 7c44328e3709..f73005a37633 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic udev user
+inherit autotools flag-o-matic udev user
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
@@ -21,11 +21,21 @@ RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 pkg_setup() {
 	enewgroup openct
 	enewuser openctd
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH
 
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index 12d4c000e8c6..6183a18acb12 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic udev
+inherit autotools flag-o-matic udev
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
@@ -27,6 +27,16 @@ RDEPEND="
 "
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH