gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 57 deletions

diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 072c10677d0f..3510ee93c76a 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,5 @@
-DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libidn2-2.1.1a-r1.ebuild 1281 BLAKE2B 97ea0ecb2ab12574e944970007c729acd6ce1c4bfa3906903f5b522cd2f004d7d5ff18edacf6d0bccb3d55a26c91d7192d55e5eb09da8f870ac5c41537ff6978 SHA512 be575ca04029a756fb52aeb0602029cf37aead1acc8b6ae6a594254f8d262fb00500b147c429ac54bdd42eb963524abea4f217656da67e42c8f4ac92a22605ef
-EBUILD libidn2-2.3.0.ebuild 1293 BLAKE2B 49627eec10d27d1e8890fc6529cae22ed64ac740e0e1949ecf1878bf09cba98be56289f365db6aec4bc47a4e52bb7765496faac3a0eb4c5d5bdd5d9350776168 SHA512 7f2c5e93cc133bbba0c52c36a4f2c1a30cd62474910787f3c4dfef2c62ac5e535a8d977de982b1318131e46cf8d31b1ba8c1c4172705303bd997d65d629ae4b5
+EBUILD libidn2-2.3.0.ebuild 1280 BLAKE2B 7c1871abbe19d7894f15625c1e73d87a2ab80b9f2cd120a24961eff8334b3f6d5574157a2117dc21213cb6eb1fde0406de8dbbd72735e7cf4234759088e50003 SHA512 78c617cb666b06fdb7fde64aa0c0787aa1ca03449853b1d46bd8c85f5310af3d5528e7b6260debfb9e8661a96eaf84ab8ccda2795480114e9212dacace759283
 EBUILD libidn2-99999.ebuild 1389 BLAKE2B fcfb60063cc023925064542e49584ea0c3a81f1fb8dc0116c34010eeef02a112461c0cd62aece8614405fa228ac984f43281bbb65e03e1b3943f6252b0f6e4f4 SHA512 0e6d9e9b3302c97e94ab059e54a43f8a23b6c64f171587a1144c3bf85ff5b2b9ca60807a1835fa39a1f8de4db1b3a9b38baa2dbd23e4e41e27b2a98c7a9e0304
 MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
deleted file mode 100644
index c67611ebd56b..000000000000
--- a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-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
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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
-"
-S=${WORKDIR}/${P/a/}
-
-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 \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gcc-warnings \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index cd0d6da96bfa..3fb6a9375886 100644
--- a/net-dns/libidn2/libidn2-2.3.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="