net-analyzer/mtr: Update live ebuild

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 2ca59571abb5598d78be59ab1c0be8ea6c779656..bcb0bbbe01b66e287cb5f5252a9491f7dee30c05 100644 (file)
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,4 +1,3 @@
-DIST gtk-2.0-for-mtr.m4.bz2 2508 BLAKE2B 86d1eb64e21084d1455783765b0be088893c260658913b9c522c35c88443e9876b39952ec33c5c69810425b7a309e382dcb32bba1443345daf81c9cfd2f84b63 SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f
 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f
 DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021

diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 896d500cbdfdc028eb99ab6eeed64ab2716a5c63..75a592ba00d8705bafec5fba453b7ecfc44ac8f7 100644 (file)
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic git-r3
+EAPI=7
+inherit autotools fcaps flag-o-matic git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="https://www.bitwizard.nl/mtr/"
 EGIT_REPO_URI="https://github.com/traviscross/mtr"
-SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +16,7 @@ IUSE="gtk ipv6 ncurses"
 RDEPEND="
        gtk? (
                dev-libs/glib:2
-               x11-libs/gtk+:2
+               x11-libs/gtk+:3
        )
        ncurses? ( sys-libs/ncurses:0= )
 "
@@ -26,26 +25,17 @@ DEPEND="
        sys-devel/autoconf
        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_unpack() {
-       git-r3_src_unpack
-       unpack ${A}
-}
+RESTRICT="test"
 
 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() {