From 9a9b6ec34d2d42959f86719b1529c175c3ef9317 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 21 Jun 2021 18:01:18 -0400 Subject: net-analyzer/multipath-tcp-tools: use binding := for dev-libs/openssl Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI. Acked-by: David Seifert Signed-off-by: Ionen Wolkens Signed-off-by: Sam James --- .../multipath-tcp-tools-2018_p12_p21-r1.ebuild | 43 ++++++++++++++++++++++ .../multipath-tcp-tools-2018_p12_p21.ebuild | 43 ---------------------- .../multipath-tcp-tools-999999.ebuild | 4 +- 3 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild delete mode 100644 net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild (limited to 'net-analyzer/multipath-tcp-tools') diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild new file mode 100644 index 000000000000..f03cf1b303bb --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" +HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" +SRC_URI="https://github.com/nasa/multipath-tcp-tools/archive/v${PV//_p/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="NOSA" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/openssl:= + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" +S=${WORKDIR}/${P//_p/-}/network-traffic-analysis-tools + +src_prepare() { + sed -i \ + -e 's|/man/man1|/share&|g' \ + -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ + Makefile || die + + default +} + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake PREFIX="${D}/${EPREFIX}/usr" install + + dodoc README +} diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild deleted file mode 100644 index 4e226a41ad29..000000000000 --- a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" -HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" -SRC_URI="https://github.com/nasa/multipath-tcp-tools/archive/v${PV//_p/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="NOSA" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-libs/openssl:* - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P//_p/-}/network-traffic-analysis-tools - -src_prepare() { - sed -i \ - -e 's|/man/man1|/share&|g' \ - -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ - Makefile || die - - default -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake PREFIX="${D}/${EPREFIX}/usr" install - - dodoc README -} diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild index edabbb51709a..ba36c687bf3f 100644 --- a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="" DEPEND=" - dev-libs/openssl:* + dev-libs/openssl:= net-libs/libpcap " RDEPEND=" -- cgit v1.2.3-65-gdbad