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() {
