gentoo resync : 22.05.2021

4 files changed, 8 insertions, 101 deletions

diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index dc875122985a..d3df7de7bb0b 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,8 +1,5 @@
-AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e333932a5f17e6fa289bac4f014d71a8acdc89748a30018ed8fadfc7e9410e30dbed70889ea2227ecb8e6e30b2b044f435cd44d3d6199d SHA512 be805ec8b11ad97a3bacdcbdcb80bc22a3be8fd1de9d512b7dd44ab207d1cf3f7db1d60af2e4c4634dcda37031a754d678ea8dab76cb23dcaf7d7bbd9683ce86
-DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
 DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
-EBUILD libtasn1-4.13.ebuild 1163 BLAKE2B 4934861cc72fc43601fe3fd74a8457281b8026cb71e8b6352464c7065762d4e66050da9dfaaf816cddbd34ce4aa56c4ceb891931b5a355a1f61d0d1eace8b07a SHA512 457f57d65320f2c6844eab613026cd1e1133b70a0312b224d186cf52fbfac9e5267357b9dfff190681e40acac5a7e877bc4cb2f9fd034cc6cc2ddc1fdb2a0057
-EBUILD libtasn1-4.15.0-r1.ebuild 1273 BLAKE2B af0146a38efec40a6eaa823d595172df9ec93d88057d32e8a56e1005be8134226b4e59a033397ac2b8b2caa5c9619785acd46b83ba314bf6078cc5f8fab55922 SHA512 a184b48b49f1d7ac25fbe928c2eb7f7aecd54658e0c91875f72cee5c0dcd736789675ab7e3fe46378ca159ac10b519572f806cb238dbfe09625c7e8113a8efa2
+DIST libtasn1-4.17.0.tar.gz 1906654 BLAKE2B a76798bdb8e68f2ca2337fa2648ff42adb7a9a51f27efefee5b9856e56ac09672237bd9a5b2afe808298e462eda31f2e8d3601c35ac00b84935f307ad981b2b1 SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
 EBUILD libtasn1-4.16.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
+EBUILD libtasn1-4.17.0.ebuild 1223 BLAKE2B 4cf24abf2d407b9c8a3c8a7ab82fa62f80fd014e7b9ff22782f08c10bfd30419b95186f3cf5b704c8f0e691e93157d0a6917eb92f638d00a6503adefe6d32b4e SHA512 93136d7a2a9bd1588251fc15204f970f702b7ee02b227717f62ec8d45b2eab850879790e0ec1cd77d6027208aeb05605c0ec728da0ba4e72f491c766a80e0d79
 MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch b/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
deleted file mode 100644
index 45360ec8f822..000000000000
--- a/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 49d6e3f0a4b5fd4da31228d23ae9efabef20c1ca Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Thu, 21 Nov 2019 16:09:20 +0100
-Subject: [PATCH] fuzz: do not install generated fuzzers and tools
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
----
- fuzz/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
-index ae6616b..aa621ce 100644
---- a/fuzz/Makefile.am
-+++ b/fuzz/Makefile.am
-@@ -38,7 +38,7 @@ FUZZERS = \
- 
- if FUZZING
-   # fuzzing mode, enabled with ./configure --enable-fuzzing
--  bin_PROGRAMS = $(FUZZERS)
-+  noinst_PROGRAMS = $(FUZZERS)
-   AM_LDFLAGS += -fsanitize=fuzzer
-   MAIN = fuzzer.h
- else
-@@ -47,7 +47,7 @@ else
-   TESTS = $(FUZZERS)
-   check_PROGRAMS = $(FUZZERS)
- 
--  bin_PROGRAMS = corpus2array
-+  noinst_PROGRAMS = corpus2array
-   corpus2array_SOURCES = corpus2array.c
- endif
- 
--- 
-2.22.2
-
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
deleted file mode 100644
index 0670215fc266..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test valgrind"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/help2man
-	virtual/yacc
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README
-	THANKS
-)
-
-pkg_setup() {
-	if use doc; then
-		DOCS+=( doc/libtasn1.pdf )
-		HTML_DOCS=( doc/reference/html/. )
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable valgrind valgrind-tests)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
index 0dd7f7bf3a2d..116fa06d177e 100644
--- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal libtool
 
 DESCRIPTION="ASN.1 library"
 HOMEPAGE="https://www.gnu.org/software/libtasn1/"
@@ -28,10 +28,6 @@ DOCS=(
 	THANKS
 )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-noinst_fuzzer_tool.patch #701928
-)
-
 pkg_setup() {
 	if use doc; then
 		DOCS+=( doc/libtasn1.pdf )
@@ -41,14 +37,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	#elibtoolize  # for Solaris shared library
-	eautoreconf #701928
+	elibtoolize  # for Solaris shared library
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(multilib_native_use_enable valgrind valgrind-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {