summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-02-20 14:07:12 +0000
committerJeroen Roovers <jer@gentoo.org>2013-02-20 14:07:12 +0000
commit86ef0a6d5f5db2a379856da92038e1b09c96b5df (patch)
treec89cdabe86af6db31c6f7c9fd9986bcacb85c4e5 /net-analyzer/mtr
parentAdd missing manpage from CVS, wrt bug #252780. Thanks to Mike Kazantsev for d... (diff)
downloadgentoo-2-86ef0a6d5f5db2a379856da92038e1b09c96b5df.tar.gz
gentoo-2-86ef0a6d5f5db2a379856da92038e1b09c96b5df.tar.bz2
gentoo-2-86ef0a6d5f5db2a379856da92038e1b09c96b5df.zip
Fix USE=-ipv6 (bug #456788).
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/mtr')
-rw-r--r--net-analyzer/mtr/ChangeLog6
-rw-r--r--net-analyzer/mtr/files/0.83-no_ipv6.patch18
-rw-r--r--net-analyzer/mtr/mtr-0.83.ebuild9
3 files changed, 28 insertions, 5 deletions
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index b97499c787df..39fe3f25ae50 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/mtr
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.129 2013/02/20 13:55:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.130 2013/02/20 14:07:12 jer Exp $
+
+ 20 Feb 2013; Jeroen Roovers <jer@gentoo.org> +files/0.83-no_ipv6.patch,
+ mtr-0.83.ebuild:
+ Fix USE=-ipv6 (bug #456788).
20 Feb 2013; Jeroen Roovers <jer@gentoo.org> mtr-0.83.ebuild:
Fix USE=-gtk (where dev-libs/glib is still used, bug #456788).
diff --git a/net-analyzer/mtr/files/0.83-no_ipv6.patch b/net-analyzer/mtr/files/0.83-no_ipv6.patch
new file mode 100644
index 000000000000..a2a8a7649eaa
--- /dev/null
+++ b/net-analyzer/mtr/files/0.83-no_ipv6.patch
@@ -0,0 +1,18 @@
+--- a/curses.c
++++ b/curses.c
+@@ -314,6 +314,7 @@
+ mpls = net_mpls(at);
+
+ if( addrcmp( (void *) addr, (void *) &unspec_addr, af ) != 0 ) {
++#ifdef ENABLE_IPV6
+ struct in6_addr addr6 = *addr;
+
+ if (PrintAS) {
+@@ -352,6 +353,7 @@
+
+ printw("[AS%s] ", chas);
+ }
++#endif /* ENABLE_IPV6 */
+ name = dns_lookup(addr);
+ if (! net_up(at))
+ attron(A_BOLD);
diff --git a/net-analyzer/mtr/mtr-0.83.ebuild b/net-analyzer/mtr/mtr-0.83.ebuild
index 19a25fd4845a..acf80e8e204b 100644
--- a/net-analyzer/mtr/mtr-0.83.ebuild
+++ b/net-analyzer/mtr/mtr-0.83.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.83.ebuild,v 1.2 2013/02/20 13:55:00 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.83.ebuild,v 1.3 2013/02/20 14:07:12 jer Exp $
+EAPI=5
inherit eutils autotools flag-o-matic
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
@@ -26,7 +25,9 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
src_prepare() {
- epatch "${FILESDIR}"/0.80-impl-dec.patch
+ epatch \
+ "${FILESDIR}"/0.80-impl-dec.patch \
+ "${FILESDIR}"/0.83-no_ipv6.patch
# 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