1 |
commit: 455cc21abfbef1f0eb76dc8e81532fda7a9d4699 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 11:05:32 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 11:10:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455cc21a |
7 |
|
8 |
net-analyzer/mtr: style changes |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/mtr/mtr-0.94.ebuild | 16 ++++++++-------- |
14 |
net-analyzer/mtr/mtr-9999.ebuild | 17 ++++++++--------- |
15 |
2 files changed, 16 insertions(+), 17 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild |
18 |
index 7f9e0050a0c..f8246b2632f 100644 |
19 |
--- a/net-analyzer/mtr/mtr-0.94.ebuild |
20 |
+++ b/net-analyzer/mtr/mtr-0.94.ebuild |
21 |
@@ -1,7 +1,8 @@ |
22 |
-# Copyright 1999-2020 Gentoo Authors |
23 |
+# Copyright 1999-2021 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=7 |
27 |
+ |
28 |
inherit autotools bash-completion-r1 fcaps |
29 |
|
30 |
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" |
31 |
@@ -12,6 +13,8 @@ LICENSE="GPL-2" |
32 |
SLOT="0" |
33 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
34 |
IUSE="gtk +ipinfo +ipv6 jansson ncurses" |
35 |
+# This is an inherited RESTRICT - figure out why! |
36 |
+RESTRICT="test" |
37 |
|
38 |
RDEPEND=" |
39 |
gtk? ( |
40 |
@@ -21,18 +24,15 @@ RDEPEND=" |
41 |
jansson? ( dev-libs/jansson ) |
42 |
ncurses? ( sys-libs/ncurses:0= ) |
43 |
" |
44 |
-DEPEND=" |
45 |
- ${RDEPEND} |
46 |
-" |
47 |
-BDEPEND=" |
48 |
- virtual/pkgconfig |
49 |
-" |
50 |
+DEPEND="${RDEPEND}" |
51 |
+BDEPEND="virtual/pkgconfig" |
52 |
+ |
53 |
DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) |
54 |
FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) |
55 |
+ |
56 |
PATCHES=( |
57 |
"${FILESDIR}"/${PN}-0.88-tinfo.patch |
58 |
) |
59 |
-RESTRICT="test" |
60 |
|
61 |
src_prepare() { |
62 |
default |
63 |
|
64 |
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild |
65 |
index 7067fbb688f..bf0d00068f9 100644 |
66 |
--- a/net-analyzer/mtr/mtr-9999.ebuild |
67 |
+++ b/net-analyzer/mtr/mtr-9999.ebuild |
68 |
@@ -1,7 +1,8 @@ |
69 |
-# Copyright 1999-2020 Gentoo Authors |
70 |
+# Copyright 1999-2021 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
EAPI=7 |
74 |
+ |
75 |
inherit autotools bash-completion-r1 fcaps git-r3 |
76 |
|
77 |
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" |
78 |
@@ -10,8 +11,9 @@ EGIT_REPO_URI="https://github.com/traviscross/mtr" |
79 |
|
80 |
LICENSE="GPL-2" |
81 |
SLOT="0" |
82 |
-KEYWORDS="" |
83 |
IUSE="gtk +ipinfo +ipv6 jansson ncurses" |
84 |
+# TODO: This is an inherited RESTRICT - figure out why! |
85 |
+RESTRICT="test" |
86 |
|
87 |
RDEPEND=" |
88 |
gtk? ( |
89 |
@@ -21,18 +23,15 @@ RDEPEND=" |
90 |
jansson? ( dev-libs/jansson ) |
91 |
ncurses? ( sys-libs/ncurses:0= ) |
92 |
" |
93 |
-DEPEND=" |
94 |
- ${RDEPEND} |
95 |
-" |
96 |
-BDEPEND=" |
97 |
- virtual/pkgconfig |
98 |
-" |
99 |
+DEPEND="${RDEPEND}" |
100 |
+BDEPEND="virtual/pkgconfig" |
101 |
+ |
102 |
DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) |
103 |
FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) |
104 |
+ |
105 |
PATCHES=( |
106 |
"${FILESDIR}"/${PN}-0.88-tinfo.patch |
107 |
) |
108 |
-RESTRICT="test" |
109 |
|
110 |
src_prepare() { |
111 |
default |