From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1208508-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7578A138359
for <garchives@archives.gentoo.org>; Tue, 22 Sep 2020 07:08:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 93507E0857;
Tue, 22 Sep 2020 07:08:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 76E26E0857
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Sep 2020 07:08:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 59DB3340E86
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Sep 2020 07:08:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 113CC35F
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Sep 2020 07:08:26 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1600758504.db0f322dffcacbfb362bf8e22596e23201dbaca3.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/mtr/metadata.xml net-analyzer/mtr/mtr-9999.ebuild
X-VCS-Directories: net-analyzer/mtr/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: db0f322dffcacbfb362bf8e22596e23201dbaca3
X-VCS-Branch: master
Date: Tue, 22 Sep 2020 07:08:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1d79f085-36f6-44d8-bf1e-b47674617c1e
X-Archives-Hash: 9542ae9eb55562dd226af7be32a65479
commit: db0f322dffcacbfb362bf8e22596e23201dbaca3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:05:39 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:08:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0f322d
net-analyzer/mtr: Update live ebuild
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/mtr/metadata.xml | 12 ++++++++----
net-analyzer/mtr/mtr-9999.ebuild | 15 ++++++++++-----
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 2c2a7923cfc..632c6e60e5b 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name='ipinfo'>Disable support for IP address lookups</flag>
+<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag>
+</use>
</pkgmetadata>
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 75a592ba00d..37f5ab5d3a6 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools fcaps flag-o-matic git-r3
+inherit autotools bash-completion-r1 fcaps flag-o-matic git-r3
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
HOMEPAGE="https://www.bitwizard.nl/mtr/"
@@ -11,18 +11,20 @@ EGIT_REPO_URI="https://github.com/traviscross/mtr"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="gtk ipv6 ncurses"
+IUSE="+gtk +ipinfo +ipv6 +jansson +ncurses"
RDEPEND="
gtk? (
dev-libs/glib:2
x11-libs/gtk+:3
)
+ jansson? ( dev-libs/jansson )
ncurses? ( sys-libs/ncurses:0= )
"
DEPEND="
${RDEPEND}
- sys-devel/autoconf
+"
+BDEPEND="
virtual/pkgconfig
"
DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
@@ -45,7 +47,10 @@ src_configure() {
econf \
$(use_enable ipv6) \
$(use_with gtk) \
- $(use_with ncurses)
+ $(use_with ipinfo) \
+ $(use_with jansson) \
+ $(use_with ncurses) \
+ --with-bashcompletiondir="$(get_bashcompdir)"
}
pkg_postinst() {