[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/

[Jeroen Roovers]

commit:     654139b011dae007329f082f2aa3c2063b0f40b5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 04:49:03 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 04:49:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654139b0

net-analyzer/mtr: Fix building against sys-libs/ncurses[tinfo].

Package-Manager: portage-2.2.20.1

 .../files/{0.80-impl-dec.patch => mtr-0.80-impl-dec.patch}    |  0
 net-analyzer/mtr/files/{0.85-gtk.patch => mtr-0.85-gtk.patch} |  0
 net-analyzer/mtr/files/mtr-9999-tinfo.patch                   | 11 +++++++++++
 net-analyzer/mtr/mtr-9999.ebuild                              |  5 +++--
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/mtr/files/0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
similarity index 100%
rename from net-analyzer/mtr/files/0.80-impl-dec.patch
rename to net-analyzer/mtr/files/mtr-0.80-impl-dec.patch

diff --git a/net-analyzer/mtr/files/0.85-gtk.patch b/net-analyzer/mtr/files/mtr-0.85-gtk.patch
similarity index 100%
rename from net-analyzer/mtr/files/0.85-gtk.patch
rename to net-analyzer/mtr/files/mtr-0.85-gtk.patch

diff --git a/net-analyzer/mtr/files/mtr-9999-tinfo.patch b/net-analyzer/mtr/files/mtr-9999-tinfo.patch
new file mode 100644
index 0000000..13f7e9e
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-9999-tinfo.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2015-08-18 06:37:10.961248647 +0200
++++ configure.ac	2015-08-18 06:40:52.016957694 +0200
+@@ -25,6 +25,8 @@
+   AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.])
+   CURSES_OBJ=)
+ 
++AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo])
++
+ AC_CHECK_LIB(ncurses, use_default_colors, 
+   AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
+ 

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 346422d..97437c4 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -38,8 +38,9 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/0.80-impl-dec.patch \
-		"${FILESDIR}"/0.85-gtk.patch
+		"${FILESDIR}"/${PN}-0.80-impl-dec.patch \
+		"${FILESDIR}"/${PN}-0.85-gtk.patch \
+		"${FILESDIR}"/${PN}-9999-tinfo.patch
 
 	sed -i -e "/^\s*xver=/s|$.*)|${EGIT_VERSION:0:8}|" Makefile.am || die
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/

[Jeroen Roovers]

commit:     63d3dcfd13613f7b9eb23f2b20533dc0e310112c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 14:07:17 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 14:07:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d3dcfd

net-analyzer/mtr: Fix building with USE="-ipv6 -gtk".

Package-Manager: portage-2.3.0

 net-analyzer/mtr/files/mtr-9999-ipv6.patch    | 59 +++++++++++++++++++++++++++
 net-analyzer/mtr/files/mtr-9999-strings.patch | 12 ++++++
 net-analyzer/mtr/mtr-0.87.ebuild              |  2 +
 net-analyzer/mtr/mtr-9999.ebuild              | 21 ++++++----
 4 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/mtr/files/mtr-9999-ipv6.patch b/net-analyzer/mtr/files/mtr-9999-ipv6.patch
new file mode 100644
index 0000000..32a6285
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-9999-ipv6.patch
@@ -0,0 +1,59 @@
+--- a/net.c
++++ b/net.c
+@@ -320,9 +320,13 @@
+   struct sockaddr_storage local;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
++#endif
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+ 
+   ttl = index + 1;
+@@ -437,9 +441,13 @@
+   struct sockaddr_storage local;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
++#endif
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+ 
+   ttl = index + 1;
+@@ -726,8 +734,12 @@
+ 
+   /* sendto() assumes packet length includes the IPv4 header but not the 
+      IPv6 header. */
++#ifdef ENABLE_IPV6
+   spacketsize = abs(packetsize)	-
+ 		( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
++#else
++  spacketsize = abs(packetsize);
++#endif
+   rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
+   if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
+     /* Try the first packet again using host byte order. */
+@@ -1535,11 +1547,15 @@
+   struct sockaddr_in name_struct;
+ #endif
+   struct sockaddr_in *  sa4;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 * sa6;
++#endif
+   struct sockaddr * name = (struct sockaddr *) &name_struct;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+   int s;
+ 

diff --git a/net-analyzer/mtr/files/mtr-9999-strings.patch b/net-analyzer/mtr/files/mtr-9999-strings.patch
new file mode 100644
index 0000000..878382b
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-9999-strings.patch
@@ -0,0 +1,12 @@
+--- a/dns.c
++++ b/dns.c
+@@ -49,7 +49,8 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ //#include <ctype.h>
+-//#include <string.h>
++#include <string.h>
++#include <strings.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>

diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index afac241..f1a2c37 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -30,6 +30,8 @@ DEPEND="
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 FILECAPS=( cap_net_raw /usr/sbin/mtr )
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.80-impl-dec.patch
+	"${FILESDIR}"/${PN}-9999-ipv6.patch
 	"${FILESDIR}"/${PN}-9999-tinfo.patch
 )
 

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 2af7b97..f54af4f 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
-inherit eutils autotools fcaps flag-o-matic git-r3
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -31,6 +30,12 @@ DEPEND="
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 FILECAPS=( cap_net_raw /usr/sbin/mtr )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.80-impl-dec.patch
+	"${FILESDIR}"/${PN}-9999-ipv6.patch
+	"${FILESDIR}"/${PN}-9999-strings.patch
+	"${FILESDIR}"/${PN}-9999-tinfo.patch
+)
 
 src_unpack() {
 	git-r3_src_unpack
@@ -38,16 +43,16 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.80-impl-dec.patch \
-		"${FILESDIR}"/${PN}-0.85-gtk.patch \
-		"${FILESDIR}"/${PN}-9999-tinfo.patch
+	default
 
 	sed -i -e "/^\s*xver=/s|$.*)|${EGIT_VERSION:0:8}|" Makefile.am || die
 
 	# Keep this comment and following mv, even in case ebuild does not need
 	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
 	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 || die #222909
+
+	eapply_user
+
 	AT_M4DIR="." eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/

[Jeroen Roovers]

commit:     b8c97104e5233bc17c08be04d117cceb5422df0c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 21:19:22 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 21:21:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c97104

net-analyzer/mtr: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/mtr/Manifest                          |  1 +
 net-analyzer/mtr/files/mtr-0.88-tinfo.patch        | 13 +++++++++++
 net-analyzer/mtr/files/mtr-9999-tinfo.patch        | 16 -------------
 .../mtr/{mtr-9999.ebuild => mtr-0.88.ebuild}       | 26 +++++++++-------------
 net-analyzer/mtr/mtr-9999.ebuild                   |  2 +-
 5 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index ea08e245715..1a56c41e055 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-2.0-for-mtr.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
 DIST mtr-0.87.tar.gz 184645 SHA256 193947c61d23b154c8dc03677e90e8fd912f8f18567ab76ce619b7856c4af19f SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 WHIRLPOOL 39fc9b60c1eccfdb1159a184f7089f13d1a8fbc35f16b7c23b746f3da709894f99571a57ef3431ca601112691c0e693b86a9941ed20bc236d2630f282e43d641
+DIST mtr-0.88.tar.gz 296225 SHA256 1e1fe4972cd972f9e5362226ebd16643ab763e6ece3b135b0f60c27e50e51e20 SHA512 81e16b8dfe2e31ca82fc456a51794b96b2dd06f4a86524ddc38abf53275b4b8ae6709792397021dfffbd4b00cf4f74b35d4085ca16fa08cf6f6e2e6b0c615533 WHIRLPOOL 24f1c50b9ad6a3884bee1745b479c8223bbd60d86a869c266549f3f51fa0ba5774b28fbbabc3cc386792410f0413038ad8c6a34d2863ab00b3730bcaaa736222

diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
new file mode 100644
index 00000000000..c7252b74435
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,7 +101,10 @@
+   # (On Solaris 11.3, ncurses builds and links for us, but curses does not.)
+   [AC_SEARCH_LIBS(
+     [initscr], [ncurses curses],
++  [AC_SEARCH_LIBS(
++    [raw], [ncurses curses cursesX tinfo],
+     [AC_DEFINE([HAVE_CURSES], [1], [Define if a curses library available])],
++    [with_ncurses=no])],
+     [with_ncurses=no])
+ ])
+ AM_CONDITIONAL([WITH_CURSES], [test "x$with_ncurses" = xyes])

diff --git a/net-analyzer/mtr/files/mtr-9999-tinfo.patch b/net-analyzer/mtr/files/mtr-9999-tinfo.patch
deleted file mode 100644
index 92e261cd736..00000000000
--- a/net-analyzer/mtr/files/mtr-9999-tinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,8 +101,11 @@
-   # (On Solaris 11.3, ncurses builds and links for us, but curses does not.)
-   [AC_SEARCH_LIBS(
-     [initscr], [ncurses curses],
--    [AC_DEFINE([HAVE_CURSES], [1], [Define if a curses library available])],
--    [with_ncurses=no])
-+	AC_SEARCH_LIBS(
-+		[raw], [ncurses curses cursesX tinfo],
-+    	[AC_DEFINE([HAVE_CURSES], [1], [Define if a curses library available])],
-+	    [with_ncurses=no]),
-+	[with_ncurses=no])
- ])
- AM_CONDITIONAL([WITH_CURSES], [test "x$with_ncurses" = xyes])
- 

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-0.88.ebuild
similarity index 66%
copy from net-analyzer/mtr/mtr-9999.ebuild
copy to net-analyzer/mtr/mtr-0.88.ebuild
index 53906d9e1e6..997a4da8bc0 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-0.88.ebuild
@@ -2,16 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils fcaps flag-o-matic git-r3
+inherit autotools eutils fcaps flag-o-matic
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
-EGIT_REPO_URI="https://github.com/traviscross/mtr.git"
-SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 ncurses"
 
 RDEPEND="
@@ -30,27 +29,18 @@ DEPEND="
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr )
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-tinfo.patch
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
 
-src_unpack() {
-	git-r3_src_unpack
-	unpack ${A}
-}
-
 src_prepare() {
-	# Keep this comment and following mv, even in case ebuild does not need
-	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
-	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 || die #222909
-
 	default
 
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	# In the source's configure script -lresolv is commented out. Apparently it
-	# is still needed for 64-bit MacOS.
+	# is needed for 64bit macos still.
 	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
 	econf \
 		$(use_enable ipv6) \
@@ -58,6 +48,10 @@ src_configure() {
 		$(use_with ncurses)
 }
 
+src_test() {
+	[[ "$UID" = 0 ]] && default
+}
+
 pkg_postinst() {
 	fcaps_pkg_postinst
 

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 53906d9e1e6..7bb86b67b47 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr )
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-tinfo.patch
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/files/, net-analyzer/mtr/

[Sam James]

commit:     2205fc63736f751148ac42654f444febcd4a3866
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 22:05:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 22:05:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2205fc63

net-analyzer/mtr: add 0.95

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/mtr/Manifest                             |  1 +
 net-analyzer/mtr/files/mtr-0.88-tinfo.patch           |  1 +
 net-analyzer/mtr/{mtr-9999.ebuild => mtr-0.95.ebuild} | 13 ++++++++++---
 net-analyzer/mtr/mtr-9999.ebuild                      | 13 ++++++++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 69472acc09a0..c36571283ffa 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1 +1,2 @@
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
+DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690

diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
index c7252b74435e..fb50c7e9a0b3 100644
--- a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
+++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
@@ -1,3 +1,4 @@
+https://github.com/traviscross/mtr/pull/368
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,7 +101,10 @@

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
similarity index 73%
copy from net-analyzer/mtr/mtr-9999.ebuild
copy to net-analyzer/mtr/mtr-0.95.ebuild
index f6a3911e9d43..42b6aeb30b04 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-0.95.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools bash-completion-r1 fcaps git-r3
+inherit autotools bash-completion-r1 fcaps
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="https://www.bitwizard.nl/mtr/"
-EGIT_REPO_URI="https://github.com/traviscross/mtr"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/traviscross/mtr"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index f6a3911e9d43..42b6aeb30b04 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools bash-completion-r1 fcaps git-r3
+inherit autotools bash-completion-r1 fcaps
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="https://www.bitwizard.nl/mtr/"
-EGIT_REPO_URI="https://github.com/traviscross/mtr"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/traviscross/mtr"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"