gentoo resync : 29.12.2022

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 09e40f0f433d..e49b5317dfb5 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,5 +1,3 @@
-DIST libtasn1-4.17.0.tar.gz 1906654 BLAKE2B a76798bdb8e68f2ca2337fa2648ff42adb7a9a51f27efefee5b9856e56ac09672237bd9a5b2afe808298e462eda31f2e8d3601c35ac00b84935f307ad981b2b1 SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
 DIST libtasn1-4.18.0.tar.gz 1724441 BLAKE2B b5f93a7575dde46741b6fc97183105efbc934e44041735241ba40ecd578c94637741df193dfab0d97e0348e2dde34b8b89a33ed616afa0bf64db6dbddebf1786 SHA512 4f2f4afc7561fda7a1f1c6c525c3c3b08228a1a4aa8c3d3d5e02e993d8f83ccee1dd0f1b201cec0fbfc97043d4b1d7a95ffd34d65422a38b85b931ac7a015831
-EBUILD libtasn1-4.17.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
-EBUILD libtasn1-4.18.0.ebuild 1121 BLAKE2B bac70f4d5eaf0a3d72b16e7fcd3420425734117bd5b1b6f4ad75b4250df037901caf151889dc35f42a732e0ab33f6a9842729c4fff0987271efd4fe87bd7dcc6 SHA512 59c22353c2c018c6c8b82f4ac26828a4a07564afb093eb43a1aacbf5bf8661327c574af4b6a9d5a2fdfd6fd7e6ada9e23fd8df49ca79fe41cc152f5d2087bd80
+EBUILD libtasn1-4.18.0.ebuild 1113 BLAKE2B 83e73a23a6064c774991415e29f817a9ab18b3a5b47061713e548dfad5946a172fd66b8dc89d18ee888ddb26dcd69cb85b88d83c8b316aed2538c90b43398086 SHA512 acc065488e1cd09cc670a3bfde018f2aacdbb787483a52755555212a4a5250c262fe545d815735e149e34f9579172035107f2226583e3774df6dce94329ef90e
 MISC metadata.xml 446 BLAKE2B 1d60c0db5d09d0b9c5f3bbead71748684f665e68e0b29b0e4023a80fbff349d4c4f5dac21e59fd222dc46e436a4336b5bbb410136dfc34d1fac44aa9a9bdb6da SHA512 1d486b356548451e21c494d267e433216e01d16673dbf1090beddb69cc6a6d13d279b11d9ec7884174a5c2109222b6dc5eebf86ee7899df4280274f7b98a0a60
diff --git a/dev-libs/libtasn1/libtasn1-4.17.0.ebuild b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
deleted file mode 100644
index 208c031ba4e9..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
+++ /dev/null
@@ -1,54 +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.md
-	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() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
index 968d58d3850b..7138eb6e7263 100644
--- a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
@@ -11,7 +11,7 @@ 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 ~loong ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="static-libs test valgrind"
 
 RESTRICT="!test? ( test )"