net-dns/libidn2: Sync with Gentoo upstream

Sync ebuild to upstream version to switch to EAPI=7, as previous
EAPIs cause issues with multilib deps when running ./build_toolchains
in the context of arm64 SDK.

Upstream commit e4adffda16496e86a61020e8569c6974f8018983
This commit is contained in:
Jeremi Piotrowski 2021-10-20 12:21:39 +00:00
parent de74177fc6
commit 4db1c1b8c3
4 changed files with 30 additions and 82 deletions

View File

@ -1,2 +1,2 @@
DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
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

View File

@ -1,29 +1,33 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit multilib-minimal
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 ~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 ~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}]
dev-libs/libunistring:=[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-lang/perl
sys-apps/help2man
verify-sig? ( app-crypt/openpgp-keys-libidn )
"
S=${WORKDIR}/${P/a/}
src_prepare() {
default
@ -40,6 +44,7 @@ src_prepare() {
multilib_src_configure() {
econf \
CC_FOR_BUILD="$(tc-getBUILD_CC)" \
$(use_enable static-libs static) \
--disable-doc \
--disable-gcc-warnings \
@ -49,5 +54,5 @@ multilib_src_configure() {
multilib_src_install() {
default
find "${D}" -name '*.la' -delete || die
find "${ED}" -name '*.la' -delete || die
}

View File

@ -1,66 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools git-r3 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"
EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/"
SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz"
LICENSE="GPL-2+ LGPL-3+"
SLOT="0/2"
KEYWORDS=""
IUSE="static-libs"
RDEPEND="
dev-libs/libunistring[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-lang/perl
dev-util/gengetopt
sys-apps/help2man
"
S=${WORKDIR}/${P/a/}
src_unpack() {
git-r3_src_unpack
unpack ${A}
}
src_prepare() {
mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
AUTORECONF=: sh bootstrap \
--gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po \
|| die
default
eautoreconf
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
}

View File

@ -1,10 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>jer@gentoo.org</email>
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
</upstream>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
<maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
</upstream>
</pkgmetadata>