commit: e39ecca23bff915015e61f8aa8732f5f11805b5b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 08:27:05 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 08:31:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e39ecca2
net-analyzer/mtr: Clean up old code in 0.93
- Drop ancient *-darwin* workaround
- Drop misguided sys-devel/autoconf dependency
- EAPI=7
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/mtr/{mtr-0.93-r1.ebuild => mtr-0.93-r2.ebuild} | 11 ++++-------
net-analyzer/mtr/mtr-9999.ebuild | 5 +----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild
b/net-analyzer/mtr/mtr-0.93-r2.ebuild
similarity index 84%
rename from net-analyzer/mtr/mtr-0.93-r1.ebuild
rename to net-analyzer/mtr/mtr-0.93-r2.ebuild
index 4380cee2360..880c2729a41 100644
--- a/net-analyzer/mtr/mtr-0.93-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.93-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic
+EAPI=7
+inherit autotools eutils fcaps
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
HOMEPAGE="https://www.bitwizard.nl/mtr/";
@@ -22,10 +22,10 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- sys-devel/autoconf
+"
+BDEPEND="
virtual/pkgconfig
"
-
DOCS=( AUTHORS NEWS SECURITY TODO )
FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
PATCHES=(
@@ -41,9 +41,6 @@ src_prepare() {
}
src_configure() {
- # In the source's configure script -lresolv is commented out.
Apparently it
- # is needed for 64bit macos still.
- [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
econf \
$(use_enable ipv6) \
$(use_with gtk) \
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 37f5ab5d3a6..3f821be8ee3 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools bash-completion-r1 fcaps flag-o-matic git-r3
+inherit autotools bash-completion-r1 fcaps git-r3
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
HOMEPAGE="https://www.bitwizard.nl/mtr/";
@@ -41,9 +41,6 @@ src_prepare() {
}
src_configure() {
- # In the source's configure script -lresolv is commented out.
Apparently it
- # is still needed for 64-bit MacOS.
- [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
econf \
$(use_enable ipv6) \
$(use_with gtk) \
