From 5d574dad28d0e3697aeca5efc6cc9c868adacd1b Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 7 Aug 2019 08:14:37 +0200
Subject: net-analyzer/mtr: Work around missing build-aux/git-version-gen

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---
 net-analyzer/mtr/mtr-0.93-r1.ebuild | 65 +++++++++++++++++++++++++++++++++++++
 net-analyzer/mtr/mtr-0.93.ebuild    | 63 -----------------------------------
 2 files changed, 65 insertions(+), 63 deletions(-)
 create mode 100644 net-analyzer/mtr/mtr-0.93-r1.ebuild
 delete mode 100644 net-analyzer/mtr/mtr-0.93.ebuild

(limited to 'net-analyzer/mtr')

diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
new file mode 100644
index 000000000000..a18dbb143fe6
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -0,0 +1,65 @@
+# 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+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="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die
+
+	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.ebuild b/net-analyzer/mtr/mtr-0.93.ebuild
deleted file mode 100644
index 3ad1b5acc2bc..000000000000
--- a/net-analyzer/mtr/mtr-0.93.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS 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
-}
-- 
cgit v1.2.3-65-gdbad