diff options
Diffstat (limited to 'net-analyzer/mtr')
| -rw-r--r-- | net-analyzer/mtr/Manifest | 8 | ||||
| -rw-r--r-- | net-analyzer/mtr/metadata.xml | 12 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-0.92-r1.ebuild | 63 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-0.93-r2.ebuild (renamed from net-analyzer/mtr/mtr-0.93-r1.ebuild) | 11 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-9999.ebuild | 18 |
5 files changed, 25 insertions, 87 deletions
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index ed6aa2590a5e..5c9b4a76279e 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -3,10 +3,8 @@ AUX mtr-0.87-ipv6.patch 1846 BLAKE2B 7d2166183a203454eca233b8ad2bc3e97c4dd7fcacd AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c31fd20fbf42cd54296282aec3ab73a8f047ed4742a7a369a18ecf9b26bcd3f56d5e9a5e565e6f66b906f5f SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa 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 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0 -EBUILD mtr-0.92-r1.ebuild 1420 BLAKE2B 8527926e0ea370212e705fc65ed8d52d092efafa1a454d78eca60458180ecf9526627a8585575eea94bf566b582c4521a194e07f1d389d1cd0533d5d9df5c31f SHA512 ad4d4561d0bee0f0870f1a821fcc31fca6c7ba54151e1b3f186ed7fd35fc74a0539c30857833b15e7fe355e070e8a691edb3b4058fe547eaab61e0594fc3017f -EBUILD mtr-0.93-r1.ebuild 1519 BLAKE2B c30c7c3bd7ff9019bbe34302772d27a3ecfed31a24ad20b7106b4d6fa642184b4108c25ae150db626580d5d68815296cc59b095bcbfa72526561475af20d7f16 SHA512 5473e13e66f1a8228f03de76cbbd2ee69bb3957d287d4380ce36da8df11441c146eb90b1ffa6bcc8e20c6bbb90a68f0cf773d7f0c7914920d84a37c2365dcbfc -EBUILD mtr-9999.ebuild 1265 BLAKE2B 8b8bdca8bbfd8b9c1a61296a34d561fc7fad185440ea00ef1d5aa3b63f70dfc65ca61d180c86d1e40045b4c1e9a456da3883853e3369c7ff9d1f4f60b8d28166 SHA512 bdb92c834b3f4c8a3b1848c6c40564ecdb1d7d1d688a77c39870be0179172b0fe6104914e5b3d3137885610a4ac63b69343af8d561f963c380832d1752642b24 -MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef +EBUILD mtr-0.93-r2.ebuild 1331 BLAKE2B aa44ba0f4126312bbfed53cf22fab692f84775f966c61b5b3b3cfb76d476cc6ef7db231194d957a7e5f7c5c140f4217b08737a31f250c4e984b1e981267d0283 SHA512 bc24e0412acc8f0a5c1dfbe556ec9ee0fe9044b2ce8e39366f555068a1471b80517f0d443a21e36bdc542d255f594d336c9817f5cfa75f21a0da8c38247f5612 +EBUILD mtr-9999.ebuild 1244 BLAKE2B e46c8c9f5b2159ca0eaeb13067bf15e27da71de31acc37610d9e95dfd04e3c7171d124f5daaafa407317027ab81fb6bb1e4bec79251a3414493a950fc895c24a SHA512 7c27c9fec1561e657210dd74f1b9398fe7e56a0a8f3c4a31fb67cd7c60b46870a7bf6642116e7454e5ea3b006fa1074c1d23ee258b3b3f9697884494ffcdbe76 +MISC metadata.xml 444 BLAKE2B a5e09136f19f4b7958c9aa882d3501bcd6f592e501540cc4949e00388a095df82f4978dd75cf611d7e4c533841398237f36e839085c64bec997a9ccc947b0273 SHA512 1178be0331a735aec9b0c45323cfc8c83eaa7dde375c3de9fe858e9d0a95d4b894e3cef7a09fe3e0c33527145ec7e3833c1c42804643b4cdf94d21f4d69080bc diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml index 2c2a7923cfc8..632c6e60e5ba 100644 --- a/net-analyzer/mtr/metadata.xml +++ b/net-analyzer/mtr/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> +<maintainer type="project"> +<email>netmon@gentoo.org</email> +<name>Gentoo network monitoring and analysis project</name> +</maintainer> +<use> +<flag name='ipinfo'>Disable support for IP address lookups</flag> +<flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag> +</use> </pkgmetadata> diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild deleted file mode 100644 index 703412cb9201..000000000000 --- a/net-analyzer/mtr/mtr-0.92-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 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="https://www.bitwizard.nl/mtr/" -SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="gtk ipv6 ncurses" - -RDEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - virtual/pkgconfig -" - -DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO ) -FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) -PATCHES=( - "${FILESDIR}"/${PN}-0.88-tinfo.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is needed for 64bit macos still. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv - econf \ - $(use_enable ipv6) \ - $(use_with gtk) \ - $(use_with ncurses) -} - -src_test() { - [[ "$UID" = 0 ]] && default -} - -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-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r2.ebuild index 4380cee23609..880c2729a41f 100644 --- a/net-analyzer/mtr/mtr-0.93-r1.ebuild +++ b/net-analyzer/mtr/mtr-0.93-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils fcaps flag-o-matic +EAPI=7 +inherit autotools eutils fcaps DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" HOMEPAGE="https://www.bitwizard.nl/mtr/" @@ -22,10 +22,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - sys-devel/autoconf +" +BDEPEND=" virtual/pkgconfig " - DOCS=( AUTHORS NEWS SECURITY TODO ) FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) PATCHES=( @@ -41,9 +41,6 @@ src_prepare() { } src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is needed for 64bit macos still. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv econf \ $(use_enable ipv6) \ $(use_with gtk) \ diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild index 75a592ba00d8..3f821be8ee37 100644 --- a/net-analyzer/mtr/mtr-9999.ebuild +++ b/net-analyzer/mtr/mtr-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools fcaps flag-o-matic git-r3 +inherit autotools bash-completion-r1 fcaps git-r3 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" HOMEPAGE="https://www.bitwizard.nl/mtr/" @@ -11,18 +11,20 @@ EGIT_REPO_URI="https://github.com/traviscross/mtr" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="gtk ipv6 ncurses" +IUSE="+gtk +ipinfo +ipv6 +jansson +ncurses" RDEPEND=" gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) + jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) " DEPEND=" ${RDEPEND} - sys-devel/autoconf +" +BDEPEND=" virtual/pkgconfig " DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) @@ -39,13 +41,13 @@ src_prepare() { } src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is still needed for 64-bit MacOS. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv econf \ $(use_enable ipv6) \ $(use_with gtk) \ - $(use_with ncurses) + $(use_with ipinfo) \ + $(use_with jansson) \ + $(use_with ncurses) \ + --with-bashcompletiondir="$(get_bashcompdir)" } pkg_postinst() { |