gentoo resync : 16.01.2021

4 files changed, 82 insertions, 5 deletions

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 6ea1504bebe4..10ccacde0bf5 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,5 +1,7 @@
-AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
+AUX mtr-0.88-tinfo.patch 494 BLAKE2B 5eba829ab106aa74799780da890b39a37f69a0cb2cf644a739d1a4e6484507bc42427995069d03ddcad811a99baae9211db907b82a3efb328edec075eee92b57 SHA512 165bcdd1aa04e7786e2e8eeab4e85d5c592198b7b9a39f2c13a229870fba47d36fc92b136277d7d4e0a241ef96c714954a78f9e1091ab71255cd5b8d88bf2fd8
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
+DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
 EBUILD mtr-0.94-r1.ebuild 1435 BLAKE2B 1d4a682c1a98d639deccbba5af331fa1a56894c46a701767bc63f19f54cb97dae0c1d42c5ef70719782ad5210be41fbc702e3ef55e1286b98d37cc322cf8d0db SHA512 bcdcfac855318bee2063247d1413f20306fe9b0687242820fab39bff1825aa3b5e3e4bc336745dc90e9920beaafeb3e87654b94401224244d82eb433bd1d9769
-EBUILD mtr-9999.ebuild 1284 BLAKE2B 08bdc5af886f337ac86070a00a804d22903090226bfd97ca233550404d05e5f933081fb66067fb828d9adca904c196badbc95c6a09af5af4f249dde145e8729f SHA512 88d134303408562729358a4022b4c77392e62d58a0f3e9dd54a1c0cc56a3ceba147763f4b1d53628cdb77ae0c65bee34991d463c62309fef2b8c278d70b8f5cf
+EBUILD mtr-0.95.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
+EBUILD mtr-9999.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2
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-0.95.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
new file mode 100644
index 000000000000..42b6aeb30b04
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.95.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 fcaps
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="https://www.bitwizard.nl/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"
+IUSE="gtk +ipinfo +ipv6 jansson ncurses"
+# TODO: This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jansson? ( dev-libs/jansson:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ipinfo) \
+		$(use_with jansson) \
+		$(use_with ncurses) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
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"