gentoo resync : 05.12.2021

3 files changed, 2 insertions, 127 deletions

diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index e1854896089e..0a3a868f8510 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,8 +1,5 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
-DIST libidn-1.37.tar.gz 2603177 BLAKE2B 2f55644b8e521ae75638e6b660f7a7e457957b783bfa359de497a475f70372d46557d9abd1263588cf8aecbaa713f24e5baf460b4aa663d3ead7326f296a58dc SHA512 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c
-DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c188c2487ea3c7677a56c7821f02ac39404581bb033a23860e8b07251efabefd85a1f2be91461f2bd27162869 SHA512 6fc3543d32d2a2b730ee22c04098420200292c95582a625cbd05729b3df40f87faa35aaceb9fa45245fa891971a10f47281f490eb7bc3099910e349c643360a2
 DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419
 DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe
-EBUILD libidn-1.37.ebuild 2806 BLAKE2B 84db394eee3598c9f893f23427f5e6994db2518de33c230d1db557eaf422b0411ccec7117ed7bbd265d1e7b183918933a9b31a73db874a222a7b67e1f240ea7d SHA512 48aadb15f08f65e09c698d7089be7f874d64eeae9421cbe4b58107115a9bb3178b2652f0a170cede42c0530a10659a2d934ba9a6750c8635daaa4ee0f24f9307
-EBUILD libidn-1.38-r1.ebuild 2754 BLAKE2B d74ad077646f3317f8c28d80f805a7e6441b517a5e680775af199f01e5765b9e9724081a90410436a958d7045d1be0cf7a353d32341b3adad66ab0261a1e3ea8 SHA512 f2908e91fd5753cc0fff4e00d563f019c57eb2f27a3fffec23030bc5a6870a44576be058b1912d9583918d0a844b508076167a5084d0a29e77ce24f69490781c
+EBUILD libidn-1.38-r1.ebuild 2748 BLAKE2B 80231521033c24922ae36b13e3fea7ae08c59ddb9632d548ba42d047f9389905dd91e44da6f0832933f6f5c918f00df45ae134b50706ae2d8521ed3c0d746b28 SHA512 ecdabd9f43e4ca50909b805fabd90116c748200271ec80e369ff390df873e2073fa2e10b71abdc0f5780d2f4227aa439c4a609957d77eb064206489d60668117
 MISC metadata.xml 348 BLAKE2B 3544235744acafa4218a8f6f4893b4dd0ba39e63c905c92aeffd50b5d6e33f68cbc8e9dc70287a04b0dbda40fcc1d92b158da5e295952553d00272940b23b27b SHA512 245f7bd50af03462e8876c12ff86d3827acee15d767361704eb60f0bda13098191f7259eb16f6b031d3c9cfe32a7819944cf9854bbe4524e1c8d8922130ff04e
diff --git a/net-dns/libidn/libidn-1.37.ebuild b/net-dns/libidn/libidn-1.37.ebuild
deleted file mode 100644
index 4d58cba26c07..000000000000
--- a/net-dns/libidn/libidn-1.37.ebuild
+++ /dev/null
@@ -1,122 +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 elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz
-	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0/12"
-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 emacs java mono nls"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-COMMON_DEPEND="
-	mono? ( >=dev-lang/mono-0.95 )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nls? ( >=sys-devel/gettext-0.17 )
-	verify-sig? ( app-crypt/openpgp-keys-libidn )
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Bundled and with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	# For Solaris shared objects
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local -x GJDOC=javadoc
-
-	local args=(
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_enable mono csharp mono)
-		$(use_enable nls)
-		--disable-static
-		--disable-valgrind-tests
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}"
-		--with-packager-bug-reports="https://bugs.gentoo.org"
-		--with-packager-version="r${PR}"
-		--with-packager="Gentoo"
-	)
-
-	ECONF_SOURCE="${S}" econf "${args[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		use emacs && elisp-compile "${S}"/src/*.el
-		use java && use doc && emake -C java/src/main/java javadoc
-	fi
-}
-
-multilib_src_test() {
-	# Only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar
-
-		rm -r "${ED}"/usr/share/java || die
-
-		use doc && java-pkg_dojavadoc "${S}"/doc/java
-	fi
-}
-
-multilib_src_install_all() {
-	if use emacs; then
-		# *.el are installed by the build system
-		elisp-install ${PN} "${S}"/src/*.elc
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	else
-		rm -r "${ED}/usr/share/emacs" || die
-	fi
-
-	einstalldocs
-
-	if use doc ; then
-		dodoc -r doc/reference/html/
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild
index 26ee757f4411..bd18e0463e20 100644
--- a/net-dns/libidn/libidn-1.38-r1.ebuild
+++ b/net-dns/libidn/libidn-1.38-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-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="doc emacs java mono nls"
 
 DEPEND="mono? ( >=dev-lang/mono-0.95 )