gentoo auto-resync : 16:12:2022 - 21:37:19

4 files changed, 2 insertions, 65 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0c42312e2589..3fb1e721f2ae 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 138a43cd2d01..4f72e4382300 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,4 @@
-DIST libidn2-2.3.3.tar.gz 2116946 BLAKE2B 47847aee34951aa2ba4fd2c3fdfdf6f1cee24bfdff8513f17896bb60fa4fae770b400ff5b78226ac5da6a3ce4120754483bafb9586c52131e7345a5ea51c4509 SHA512 2dd0201b5224b3eb6a5667e53c9a2beb6e6aefefab23060a70f143bb5d447029e8f4200e4e0460a4fab51767f0bdfc9583a0cc757652bee58f5593106dd18274
-DIST libidn2-2.3.3.tar.gz.sig 228 BLAKE2B 47b861c6234e14fc03d606a67a0dd6de829434cb06ba3e3c0fabade59fa3a761d6e5cb81553c74b4356064744efb6a0736cb55a2680ce6f90cd13b0f1001efed SHA512 bad901350e21ff39f0385685c13b3f366cd77dad59c736547773f9555531bc56022982c3fb6fffd5b82624bdd3ea8bd1806e531f80a06c77e4e46b08f18f08a9
 DIST libidn2-2.3.4.tar.gz 2083823 BLAKE2B 26ef58894ad51ca9775cf07edb1353a8aeb7af0df36ce8698425be216a067903797cdbc50c7644292c7e05b23c7bba35c9fe5e38c70e6f55784d8bcdd9c2fdb2 SHA512 a6e90ccef56cfd0b37e3333ab3594bb3cec7ca42a138ca8c4f4ce142da208fa792f6c78ca00c01001c2bc02831abcbaf1cf9bcc346a5290fd7b30708f5a462f3
 DIST libidn2-2.3.4.tar.gz.sig 228 BLAKE2B 0aa25bbd58b76724dc7f6d7a40dd578bf28f4b786c32933fae330c4330da8fabd549c45b579bfc0ef0178b10122e59c6b33bd78a8425c744dff2ace7e75018dd SHA512 d2a575723326ae256a60e3edf7766af65434f716e11f963bb7ac29b6b2ff2872b41684a1bd1c6f3a3921e8a083512eff1faf2b0fc02513095c2bcf3563312fe0
-EBUILD libidn2-2.3.3.ebuild 1569 BLAKE2B aaa44fa35850b790055f0fc3565a44b11e5ae99466c4215b7e84e1dc172fd57e82c15694f18a5048555f46940bfec112c8b7fb0a8b06ab216a2ea4224f1beefe SHA512 5c6521a23b6c1798cd2000f8d8a6d28150530d2242077caa0810d8b908a0e4058e105939e190cf29074b61b9abe4ca1770a9d7a493f6499d031dea5dfeeb22d3
-EBUILD libidn2-2.3.4.ebuild 1370 BLAKE2B 862d769d9c5ee0f305aed483d7e019c3e826a67d1a23afbd8685c4e01d2035a939c69d78fe031e3fdeea410898af4993a798fad4c0a132c8308a3068d1193ff1 SHA512 400ae0666a4edbc516e3c7e541bd54425817a6dcb3b757f0c60d9c8558607950b67bf7cfcce4932afaf0457e6dbe97ca834b995dc78d40b12c42e1a355d691b3
+EBUILD libidn2-2.3.4.ebuild 1366 BLAKE2B a2dad6524f0be69ac65294b3daf04f293977787093095be0c4b04a74aed70217751a216e27a54de2cf84e16d44f078deb0ae08fa7e7cbbd334e6ebb772894114 SHA512 80a70481deedca85bbc565f4c45699cbfd6ceebd4880ef15c2b2c721d03d0747fd4ee08cc7c8795a556680df1d32670ce98c920c2ed4256fa79bca1564859958
 MISC metadata.xml 616 BLAKE2B 8f655a4bf8a19dc46ad2c171a185418193042a5d94e7819cf7366c543f2bab24150715c9966f653cf6efbe1bfcaf4c7f0f2d2bc2cc4c876456e07ef823005953 SHA512 2f23e3e9efc8cabc33337a6c19b0b5d627327538ba3b4e669cac7aa7b424362eae6630249ae162df4d03c833c094affb223f80ee7f914ea87655a45576a11f70
diff --git a/net-dns/libidn2/libidn2-2.3.3.ebuild b/net-dns/libidn2/libidn2-2.3.3.ebuild
deleted file mode 100644
index aa0909da9a82..000000000000
--- a/net-dns/libidn2/libidn2-2.3.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~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="nls static-libs"
-
-RDEPEND="
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	sys-apps/help2man
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/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) \
-		$(multilib_native_use_enable nls) \
-		--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.4.ebuild b/net-dns/libidn2/libidn2-2.3.4.ebuild
index 235815c81ca3..abe76b1078f5 100644
--- a/net-dns/libidn2/libidn2-2.3.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-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="nls static-libs"
 
 RDEPEND="