3 files changed, 2 insertions, 118 deletions
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 7df0d63c4c4e..01a05b844405 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,7 +1,5 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
-DIST libidn-1.36.tar.gz 4557804 BLAKE2B 562ea97cba7970e3f3bd1557ba9e25e4180cca1b5cb8f66539f7830baf195cd36dc513c50e2475829af42d420e3d3b73a1c002acb06579c8b8b3879dcc8f95b2 SHA512 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad
 DIST libidn-1.37.tar.gz 2603177 BLAKE2B 2f55644b8e521ae75638e6b660f7a7e457957b783bfa359de497a475f70372d46557d9abd1263588cf8aecbaa713f24e5baf460b4aa663d3ead7326f296a58dc SHA512 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c
 DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c188c2487ea3c7677a56c7821f02ac39404581bb033a23860e8b07251efabefd85a1f2be91461f2bd27162869 SHA512 6fc3543d32d2a2b730ee22c04098420200292c95582a625cbd05729b3df40f87faa35aaceb9fa45245fa891971a10f47281f490eb7bc3099910e349c643360a2
-EBUILD libidn-1.36.ebuild 2616 BLAKE2B e768b6b0ddff783ae0f1dcc797790e48e1c76ca53591f3b6ef382833078d3b041641bf442f516050847dbb2d870a2090b3c4ad6a78b5632561d5be5dde149756 SHA512 1abe67f936bf69a62de01c026b1d442db5529e7bb008b04c19af7a0fe51de1f65a4de49ff2dcf970c5cc06ee6f8fee0b1444c180beba82d5a2f06474ac3865ef
-EBUILD libidn-1.37.ebuild 2799 BLAKE2B 08bba5fc26e5a85fa2716dad1876c617f58ef43bee94fc98dfc673d9a3b0c67e7da4c2f1ff6b35a2a98545e281e0e17e0d4f37c5d8840a351e35fb53e67daeec SHA512 4ee4df05bccf00c9571f1591acbedce7ebd64e636f97cdf844045847b191ac11c569aba58fa019209b1c8987af2994e255aef3a64a5b4e2e8fde50fed47a7db7
+EBUILD libidn-1.37.ebuild 2798 BLAKE2B 6ba3a5a3a6699f45d9e52d54df7933f26e97290fd2a957f90b4be22fee8f13de5e722fae7991b9d88fcf422f84fc0bbeac93d02eb0f28ac80540c32a4c13e3e9 SHA512 7b6fa387a4177cad5ec1b5f5d102da90deb641570c20d59aae90172b318faf6865431cf7142f3606bc8ef75c9c23389a1a22c0a448968abdb0cd3f89c94e23c7
 MISC metadata.xml 347 BLAKE2B 293e4cc6e22f51f47bf25f9be723ae443dd92138e6ddac7bfa4bbeb314a823dcf62429551125167fdc41e1031050f5baf034f493daa1cfa0aaa3fd824a4ddea7 SHA512 8fc22ee1c8de823f07c90e20c8075ef00ad130c07f5e556f61b501e4b162992050cbbfd6ad492b551464370f8d90382f3243d93830be92ccef6bd54481dd6bdd
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
deleted file mode 100644
index fc9779677ca6..000000000000
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-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"
-IUSE="doc emacs java mono nls"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
-	mono? ( >=dev-lang/mono-0.95 )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bundled, with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	elibtoolize  # for Solaris shared objects
-}
-
-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.37.ebuild b/net-dns/libidn/libidn-1.37.ebuild
index 2854a5c064a0..c188af3af801 100644
--- a/net-dns/libidn/libidn-1.37.ebuild
+++ b/net-dns/libidn/libidn-1.37.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"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )