gentoo resync : 03.11.2019

5 files changed, 18 insertions, 29 deletions

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 2bb45374cf7d..f8166e82b689 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -2,12 +2,11 @@ AUX mtr-0.80-impl-dec.patch 226 BLAKE2B ba16f81170ad40b472760f9130f139f092c69d70
 AUX mtr-0.87-ipv6.patch 1846 BLAKE2B 7d2166183a203454eca233b8ad2bc3e97c4dd7fcacd6325d83694938c026cf9cee25d8ecc3d799e8ffa09315361117f41981e382af296538cbf6fffb23b5121e SHA512 07a43b798b30893583fb08e7e65a6833ece98f18656f6a31e7e61acd1f582d68d35b63d5aada4175d5df2451cbd856370e85f514e1ee8447ada9a91a83af1345
 AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c31fd20fbf42cd54296282aec3ab73a8f047ed4742a7a369a18ecf9b26bcd3f56d5e9a5e565e6f66b906f5f SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
-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
-EBUILD mtr-0.87.ebuild 1150 BLAKE2B f7157b21c48d9fb942cf90db72ab8a3969abe8f295bcc4345ccddb12b50a7797f46fec44ab40f30c556040d6f72c1d3236898bb230bc742513e5e1c44f8c4e7a SHA512 baf2f11237b50b16037f9983869f1cb890bb4e37fb8d7604ecf5bc0a28397ecc2644a960c47b01bfb9a00deb06d2ea41915315ad53b8bb92f11b83f42152331f
-EBUILD mtr-0.92-r1.ebuild 1418 BLAKE2B 7617cf78513e3987491fe9f8c735160eda5fd524274f23e57cc41a40bf6cadc2fa86ac039f71622832ac25b67632a031bd6b70c4ed080d3a90723a8ac039414c SHA512 2864b1f8722b8206bfb1a9191251dc8e07fd1537344d802056b66b33aec3c9c830c9b09c6f310124c94a914fc3194a6b4c550d8de7542d2690d95a8a12a53cf8
-EBUILD mtr-0.93-r1.ebuild 1507 BLAKE2B 25bb941cf95898609dfe5e432535c49cacceacdf5c15d04f0ef3bd6257b18babcdb8502ea315c33bad2536bfa242c71aeb093fe8e6bd8acf124592a73e50d40c SHA512 8a15dec7446bd7642bb59113ad6ae6451856abb5f337875563233e8350705d8d0d0ab6000192074cf14bc7f28267a70e837ccfa37fde29865e22e980270751cf
-EBUILD mtr-9999.ebuild 1581 BLAKE2B e52533acb767ab356958eeb91e19deada75245671b24e201283a0db85493f2850db3c66351ee25c7471133eaed9fc1a1b1db715b78c496b6af002eda1cc31da0 SHA512 7a43bba45d9a2b17bbfa92dcdd9ede2ed9c1c7a5a6ed8a95e4ad6d1dc0be3783bd7cfe148674a1469e196da9a6c8b19d13d2abf6ae88464ed2e0b181dd61ca7e
+EBUILD mtr-0.87.ebuild 1156 BLAKE2B 034cb794c10bcf59fb8ac37c0d8e7e0d9d2890c5020c79166e4e72daae1b4c20dfbd245712db04df999951e0656e955aab1700e9e5a3ea6a8a148028603f417e SHA512 aebbbceb187ae310b0b5201e9a6714c4b5edecf3a449b94898591948850b95994066d4d617cd81e00bfab3fea330be630f93d2d1953bc716d117b6b1aa95018e
+EBUILD mtr-0.92-r1.ebuild 1424 BLAKE2B b8ac6ee0aee8c14de230a724f29c9a02bf828546b68689e95cd890037ab609754560a23d5bb922a8109262916aaa6af36f8696827734f4f36ff32fab224d0c57 SHA512 66552bf4dc1f2a765cc27afa7e070fe82fd551d30d45dca4f9be10133117aa8428d608637594bdc76d784a0cf2e3608c82b4338121c2d9d5161736c23374498c
+EBUILD mtr-0.93-r1.ebuild 1516 BLAKE2B dc40f0a55e8ae08ff73b89491b7dbd56715b80871a6ab16cf91415c4d3ee5512c83b02ac4c357206fad0a160b1efbcc27b8b72120df88ce8f7226d4c725e606b SHA512 3f686ba48e6c67ce7cde669d23dcb3fb97c5405b23099f9e1857d6ec51d21823abb3a25872303346a7c5b1e9c0be69eaee58b2687a2f55c332db9b727e57af15
+EBUILD mtr-9999.ebuild 1265 BLAKE2B 8b8bdca8bbfd8b9c1a61296a34d561fc7fad185440ea00ef1d5aa3b63f70dfc65ca61d180c86d1e40045b4c1e9a456da3883853e3369c7ff9d1f4f60b8d28166 SHA512 bdb92c834b3f4c8a3b1848c6c40564ecdb1d7d1d688a77c39870be0179172b0fe6104914e5b3d3137885610a4ac63b69343af8d561f963c380832d1752642b24
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index 575256d8fca3..6cfd1bd5b83d 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
index c0124945b425..f3684cc00ecd 100644
--- a/net-analyzer/mtr/mtr-0.92-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
index dc7f90ebcff8..d9d465764723 100644
--- a/net-analyzer/mtr/mtr-0.93-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit autotools eutils fcaps flag-o-matic
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 6185590ebe48..75a592ba00d8 100644
--- 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="http://www.bitwizard.nl/mtr/"
+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() {