diff options
| author | Jeroen Roovers <jer@gentoo.org> | 2016-08-04 16:07:17 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2016-08-04 16:07:29 +0200 |
| commit | 63d3dcfd13613f7b9eb23f2b20533dc0e310112c (patch) | |
| tree | 52e55f8b2c14d8fdb949c1a50274d8a049812907 /net-analyzer/mtr/mtr-9999.ebuild | |
| parent | 2d16abba3a65488c85fd9867b1ab463d4df972f3 (diff) | |
| download | gentoo-63d3dcfd13613f7b9eb23f2b20533dc0e310112c.tar.gz gentoo-63d3dcfd13613f7b9eb23f2b20533dc0e310112c.tar.xz | |
net-analyzer/mtr: Fix building with USE="-ipv6 -gtk".
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-analyzer/mtr/mtr-9999.ebuild')
| -rw-r--r-- | net-analyzer/mtr/mtr-9999.ebuild | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild index 2af7b978a2f..f54af4fbe10 100644 --- a/net-analyzer/mtr/mtr-9999.ebuild +++ b/net-analyzer/mtr/mtr-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 - -inherit eutils autotools fcaps flag-o-matic git-r3 +EAPI=6 +inherit autotools eutils fcaps flag-o-matic git-r3 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" HOMEPAGE="http://www.bitwizard.nl/mtr/" @@ -31,6 +30,12 @@ DEPEND=" DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO ) FILECAPS=( cap_net_raw /usr/sbin/mtr ) +PATCHES=( + "${FILESDIR}"/${PN}-0.80-impl-dec.patch + "${FILESDIR}"/${PN}-9999-ipv6.patch + "${FILESDIR}"/${PN}-9999-strings.patch + "${FILESDIR}"/${PN}-9999-tinfo.patch +) src_unpack() { git-r3_src_unpack @@ -38,16 +43,16 @@ src_unpack() { } src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.80-impl-dec.patch \ - "${FILESDIR}"/${PN}-0.85-gtk.patch \ - "${FILESDIR}"/${PN}-9999-tinfo.patch + default sed -i -e "/^\s*xver=/s|$.*)|${EGIT_VERSION:0:8}|" Makefile.am || die # 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 + + eapply_user + AT_M4DIR="." eautoreconf } |