Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/
Date: Tue, 11 Jan 2022 22:06:19
Message-Id: 1641938753.2205fc63736f751148ac42654f444febcd4a3866.sam@gentoo
1 commit: 2205fc63736f751148ac42654f444febcd4a3866
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 11 22:05:30 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 22:05:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2205fc63
7
8 net-analyzer/mtr: add 0.95
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 net-analyzer/mtr/Manifest | 1 +
13 net-analyzer/mtr/files/mtr-0.88-tinfo.patch | 1 +
14 net-analyzer/mtr/{mtr-9999.ebuild => mtr-0.95.ebuild} | 13 ++++++++++---
15 net-analyzer/mtr/mtr-9999.ebuild | 13 ++++++++++---
16 4 files changed, 22 insertions(+), 6 deletions(-)
17
18 diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
19 index 69472acc09a0..c36571283ffa 100644
20 --- a/net-analyzer/mtr/Manifest
21 +++ b/net-analyzer/mtr/Manifest
22 @@ -1 +1,2 @@
23 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
24 +DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
25
26 diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
27 index c7252b74435e..fb50c7e9a0b3 100644
28 --- a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
29 +++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
30 @@ -1,3 +1,4 @@
31 +https://github.com/traviscross/mtr/pull/368
32 --- a/configure.ac
33 +++ b/configure.ac
34 @@ -101,7 +101,10 @@
35
36 diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
37 similarity index 73%
38 copy from net-analyzer/mtr/mtr-9999.ebuild
39 copy to net-analyzer/mtr/mtr-0.95.ebuild
40 index f6a3911e9d43..42b6aeb30b04 100644
41 --- a/net-analyzer/mtr/mtr-9999.ebuild
42 +++ b/net-analyzer/mtr/mtr-0.95.ebuild
43 @@ -1,13 +1,20 @@
44 -# Copyright 1999-2021 Gentoo Authors
45 +# Copyright 1999-2022 Gentoo Authors
46 # Distributed under the terms of the GNU General Public License v2
47
48 EAPI=7
49
50 -inherit autotools bash-completion-r1 fcaps git-r3
51 +inherit autotools bash-completion-r1 fcaps
52
53 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
54 HOMEPAGE="https://www.bitwizard.nl/mtr/"
55 -EGIT_REPO_URI="https://github.com/traviscross/mtr"
56 +
57 +if [[ ${PV} == *9999* ]] ; then
58 + EGIT_REPO_URI="https://github.com/traviscross/mtr"
59 + inherit git-r3
60 +else
61 + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
62 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
63 +fi
64
65 LICENSE="GPL-2"
66 SLOT="0"
67
68 diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
69 index f6a3911e9d43..42b6aeb30b04 100644
70 --- a/net-analyzer/mtr/mtr-9999.ebuild
71 +++ b/net-analyzer/mtr/mtr-9999.ebuild
72 @@ -1,13 +1,20 @@
73 -# Copyright 1999-2021 Gentoo Authors
74 +# Copyright 1999-2022 Gentoo Authors
75 # Distributed under the terms of the GNU General Public License v2
76
77 EAPI=7
78
79 -inherit autotools bash-completion-r1 fcaps git-r3
80 +inherit autotools bash-completion-r1 fcaps
81
82 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
83 HOMEPAGE="https://www.bitwizard.nl/mtr/"
84 -EGIT_REPO_URI="https://github.com/traviscross/mtr"
85 +
86 +if [[ ${PV} == *9999* ]] ; then
87 + EGIT_REPO_URI="https://github.com/traviscross/mtr"
88 + inherit git-r3
89 +else
90 + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
91 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
92 +fi
93
94 LICENSE="GPL-2"
95 SLOT="0"