gentoo resync : 08.10.2021

3 files changed, 2 insertions, 63 deletions

diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 98b41a0bc074..1cbf7ca1b449 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,4 @@
-DIST libidn2-2.3.1.tar.gz 2188338 BLAKE2B 323840b0d84f41cc746ca9b5a24169a374e95bd4669b96d7b62ac3304f6d78195acef7739628cf7e31cf7b230ffb60f74961c3e22693571fd2fc7cbb35f1ac23 SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4
-DIST libidn2-2.3.1.tar.gz.sig 488 BLAKE2B 2e1428ec240964fcdc1dbe96afa69920e5f5439ebf9c58e134832ceab932aef57176744a8fdf76ca29e73650c18406ec894b8e92dd95d52cb712bf7f823ca820 SHA512 2db4bb3a11562634276664fb857306271c6ebc96cf5e90b39b404c3fe47190ec65ce3866cebcfa0c1216d29d7aed8c7907b869e602a722db1cf8f6ab94da9c78
 DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
 DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
-EBUILD libidn2-2.3.1.ebuild 1491 BLAKE2B 98c8872036e18f8c2272b31f94e80882e99df7f15953785f8ea50924bba398d1833d475f772ef447298500a273733437e3ac441f4bd9a7d46026609e2a6a7af9 SHA512 fed576edbdce4b3f66d85e2eef741cb307436f8c014c3c324c8ac9905f0941373613b45c17d4d0e03ce4e6d339185b099280f764d8969814dfb4d0121781d5dc
-EBUILD libidn2-2.3.2.ebuild 1492 BLAKE2B 3324296ffdfde99e7c19fb0673d9eb490ea5e57177d77ad204038458d51b4b67c0750aada370400624cc64f99934b4e25a69dbe7994c3ed38ae5e9638dd21548 SHA512 e46277ef8cd27c39e158071bf71637d1123614bd42a12a27832ae7c878ec52c0ee435420d1d3ce4f373e55a2ab6dc31d75005c95637c47e7ca9760ba5a26aad2
+EBUILD libidn2-2.3.2.ebuild 1491 BLAKE2B 98c8872036e18f8c2272b31f94e80882e99df7f15953785f8ea50924bba398d1833d475f772ef447298500a273733437e3ac441f4bd9a7d46026609e2a6a7af9 SHA512 fed576edbdce4b3f66d85e2eef741cb307436f8c014c3c324c8ac9905f0941373613b45c17d4d0e03ce4e6d339185b099280f764d8969814dfb4d0121781d5dc
 MISC metadata.xml 562 BLAKE2B 2c0acdc86f7ed795dd961bb9d1dab56c31cf7c50f458e659f758a1317be25631e8da5326c74c54b78c12d9b788d8ccbfa666c98217c730e4aee9ab3bdb29cdc2 SHA512 b8daf38cbe7670f7172edd2b05be23bd70e419817398d22583199e5f8f997fc395b869a8143ef69cffc3eb9834876bc22b40d89d60b5df1b16cc179606272273
diff --git a/net-dns/libidn2/libidn2-2.3.1.ebuild b/net-dns/libidn2/libidn2-2.3.1.ebuild
deleted file mode 100644
index a0e563e61005..000000000000
--- a/net-dns/libidn2/libidn2-2.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
-inherit multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )
-"
-S="${WORKDIR}"/${P/a/}
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/2"
-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="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	sys-apps/help2man
-	verify-sig? ( app-crypt/openpgp-keys-libidn )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gcc-warnings \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild
index ec08d04961af..a0e563e61005 100644
--- a/net-dns/libidn2/libidn2-2.3.2.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-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"
+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="static-libs"
 
 RDEPEND="