commit: cd50b985a05a1c702e24a876361191fe0f22efc0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Sep 12 09:12:10 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 3 04:26:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd50b985
net-libs/ldns: Update for dev-libs/openssl bindist update Bug: https://bugs.gentoo.org/762850 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> .../{ldns-1.8.0-r1.ebuild => ldns-1.7.1-r6.ebuild} | 28 ++++------------------ .../{ldns-1.8.0-r1.ebuild => ldns-1.8.0-r2.ebuild} | 9 ------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r6.ebuild similarity index 67% copy from net-libs/ldns/ldns-1.8.0-r1.ebuild copy to net-libs/ldns/ldns-1.7.1-r6.ebuild index 5d48f102da5c..a0986afdac4b 100644 --- a/net-libs/ldns/ldns-1.8.0-r1.ebuild +++ b/net-libs/ldns/ldns-1.7.1-r6.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit python-single-r1 autotools multilib-minimal +inherit multilib-minimal python-single-r1 DESCRIPTION="a library with the aim to simplify DNS programming in C" HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"; @@ -14,23 +14,13 @@ SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" -# configure will die if ecdsa is enabled and ssl is not REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" python? ( ${PYTHON_DEPS} ) - ecdsa? ( - >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed25519? ( - >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed448? ( - >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} python? ( dev-lang/swig ) @@ -75,19 +65,9 @@ multilib_src_configure() { src_prepare() { default + eapply -p0 "${FILESDIR}/${P}-Makefile.patch" # remove non-existing dependency for target packaging/libldns.pc - sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove $(srcdir) from path for multilib build - sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove Libs.private, see bug #695672 - sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in' - - # backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184 - sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac' - - eautoreconf + sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' } multilib_src_compile() { diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r2.ebuild similarity index 92% rename from net-libs/ldns/ldns-1.8.0-r1.ebuild rename to net-libs/ldns/ldns-1.8.0-r2.ebuild index 5d48f102da5c..88e154dc8a7f 100644 --- a/net-libs/ldns/ldns-1.8.0-r1.ebuild +++ b/net-libs/ldns/ldns-1.8.0-r2.ebuild @@ -21,15 +21,6 @@ REQUIRED_USE=" RDEPEND=" python? ( ${PYTHON_DEPS} ) - ecdsa? ( - >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed25519? ( - >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed448? ( - >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}] - ) >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND}
