gentoo resync : 12.05.2022

4 files changed, 14 insertions, 98 deletions

diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index b94f412928b3..75584d6ffb86 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,8 +1,6 @@
-AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 AUX pkcs11-helper-1.27.0-nss.patch 614 BLAKE2B 68db71f025aebd620d278fa3847b1ead5645220c6a1b0f16f98b2e9f22ca6153b133ab5d8c236a24bbc6527a4e2ae084ea58a1c3c9cce7feb20a32861859a56b SHA512 9e6787822d003e0f6d959ce02308e23231dfb75e711cbf1887684e8dd479f10da5d123e47ed48ace84d6d8eb04754f0729c3847080074f34a49a4c484ad1a618
-DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 DIST pkcs11-helper-1.27.0.tar.bz2 422425 BLAKE2B a9fd7ef04dce1abbae57b09a12b4be560465ae0cf2910443332882967d00b6380c62944820aa9580e101459d1c35edaae68cd7abbafa308a8b152921ac32f04c SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
-EBUILD pkcs11-helper-1.25.1-r1.ebuild 1006 BLAKE2B d1eb0f02e05bd907a02026f5ad13203e16a1aa982d89f4007bbe7f868af5d2247d5a3548a75b96ab132ed5408c897ed4efbe5810665edb1759fd6841e8d54fb7 SHA512 334b7ca21009081a71d987961f8373140961d5f3bb826e6142f2d795c48fccfbba8a3f3ee027cd649d4fa48aac5ab14f96dbff3028cafe634ee7889298be5c7b
+DIST pkcs11-helper-1.29.0.tar.bz2 422549 BLAKE2B fec72ac82f1545fc50f80b5b28db12906df32fa3bc65f80541d8bee7f1d1c8062f1f0516344237424022c01d4f390e8a72e3e0262250f3b6c51df92c768d81ee SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2
 EBUILD pkcs11-helper-1.27.0-r1.ebuild 1071 BLAKE2B 4d0d25826aa7d793940481c06936db32c76079afc1a070b13f076fe7f04ac1d6aeb3087f3fe3866b239083ed85a97c3fcd92c4457bc9aef2ba08eb3935a0616b SHA512 d99c56df4a2d9c652cf14edca110f8c43c496bbee70e85f1206e4d670739985b63216427f586e7309e4d35b5e71db298b71556dfde176fdc429cd545f31cfa23
-EBUILD pkcs11-helper-1.27.0.ebuild 1093 BLAKE2B 81a836ac0ce8eb6b7a359f1b858053050aab5ea4c28fa21baed1bfd8a77d327cf570201d82fde663b9b89eef9963b6545a46b162bb738370de7ec83a9341a12e SHA512 1d80c3b9bfa79d93609c44f3bd37c9ffe1607b2d450bcd406502fdb1de08ccf57092401587de4fd123767992da7b7994bbd9fa937a516cc3b2fd59167b440d84
+EBUILD pkcs11-helper-1.29.0.ebuild 971 BLAKE2B a918ddab756b30c0850765cef5a50c5dd745061852de581c19a8e35e0dd32ae177790b345b0fb18c306b136d8edb50dd368529773b97736d89286e4841456a83 SHA512 4eb9576ebdad75f71d4fd4b5ae3229c6d240549ac9fe982d9b7065e9c8716fd0a0dc5348851c151f27f4f14986473220c5e18afad1e2fe5c881776f7eaa4ec5c
 MISC metadata.xml 435 BLAKE2B 7740f428a33cecd516c6cfb96de878c8080b2cba0b42c78cc34bac42d128619cf4a42b966aafe30bfc13a045ad0017285ecff9d60d237eadd715fcdf6029c8b8 SHA512 2a9c9d99cfcac14b7c201d5d931f5d1fe0d544328f32db5048a9cd15f0a99ef4016e4b5ec4391500cb5a9e3c00205c72211c61c1fc13cda330faf6b7eb9eeea9
diff --git a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
deleted file mode 100644
index a657dba14ce2..000000000000
--- a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0e2ae10ef9611beef92457171e8c78d8e936dfca Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 22 Aug 2018 20:24:19 +0300
-Subject: [PATCH] openssl: build with openssl ec disabled
-
----
- ChangeLog             | 1 +
- lib/pkcs11h-openssl.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
-index c981e21..4ebc211 100644
---- a/lib/pkcs11h-openssl.c
-+++ b/lib/pkcs11h-openssl.c
-@@ -263,6 +263,7 @@ DSA_SIG_set0 (DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
- }
- #endif
- 
-+#ifdef __ENABLE_EC
- #ifndef HAVE_ECDSA_SIG_SET0
- static int
- ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
-@@ -275,7 +276,6 @@ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
- }
- #endif
- 
--#ifdef __ENABLE_EC
- #ifndef HAVE_EC_KEY_METHOD_GET_SIGN
- void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
- 	int (**psign)(int type, const unsigned char *dgst,
--- 
-2.16.4
-
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild
deleted file mode 100644
index 7d1814330930..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
-
-if [[ $(ver_cut 3) -eq 0 ]]; then
-	MY_PV=$(ver_cut 1-2)
-else
-	MY_PV=${PV}
-fi
-
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${PN}-${MY_PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bindist doc gnutls nss static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7:0=[bindist(-)=]
-	gnutls? ( >=net-libs/gnutls-1.4.4 )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-nss.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-crypto-engine-polarssl \
-		--disable-crypto-engine-mbedtls \
-		$(use_enable doc) \
-		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
index 96d1d2412c3b..c8b02fd6835d 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="PKCS#11 helper library"
 HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
@@ -9,32 +9,30 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bindist doc gnutls nss static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc gnutls nss"
 
-RDEPEND="
-	>=dev-libs/openssl-0.9.7:0=[bindist(-)=]
-	gnutls? ( >=net-libs/gnutls-1.4.4 )
+RDEPEND=">=dev-libs/openssl-0.9.7:=
+	gnutls? ( >=net-libs/gnutls-1.4.4:= )
 	nss? ( dev-libs/nss )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.4.7 )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
 src_configure() {
 	econf \
 		--disable-crypto-engine-polarssl \
 		--disable-crypto-engine-mbedtls \
 		$(use_enable doc) \
 		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss) \
-		$(use_enable static-libs static)
+		$(use_enable nss crypto-engine-nss)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+
+	# bug #555262
+	rm "${ED}"/usr/share/doc/${PF}/COPYING.{BSD,GPL} || die
+
+	find "${ED}" -name '*.la' -delete || die
 }