Version bump for bug 80383. Moved epatch statement to src_unpack where it belongs and fixed deps. Added ipv6 support via USE=ipv6.

(Portage version: 2.0.51-r15)

5 files changed, 92 insertions, 26 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index c8a89e36e9f8..9764b9ba74d2 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.34 2005/01/31 17:11:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.35 2005/02/02 11:18:13 ka0ttic Exp $
+
+*mtr-0.69 (02 Feb 2005)
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> mtr-0.67.ebuild,
+  +mtr-0.69.ebuild:
+  Version bump for bug 80383. Moved epatch statement to src_unpack where it
+  belongs and fixed deps. Added ipv6 support via USE=ipv6.
 
   31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mtr-0.67.ebuild:
   Stable on sparc
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index e72374604b7b..571e0176d98c 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 720bffd73acf542e859034ca9d443c19 metadata.xml 244
-MD5 381d408fac97a32aab7b551d21b43313 ChangeLog 3778
-MD5 c41d97641d0a0b4993d8800ebffca6cb mtr-0.67.ebuild 1094
 MD5 a3b4b988a1980902f6bc49441c3b6268 mtr-0.54-r2.ebuild 1161
+MD5 d3a1864f1f1799a0d5c4a1fd09de3031 mtr-0.67.ebuild 1304
+MD5 0b8cb574fd3b45fb2e8a224ff4f98132 mtr-0.69.ebuild 1334
 MD5 b641efd6120f353b0b9a62a3fee71dc7 mtr-0.64.ebuild 1093
-MD5 ed7a57f974bbb8a86b2fc02be7277c94 files/digest-mtr-0.67 60
+MD5 ac3717ca2345cfc7f6ba7ff1b5e48d71 ChangeLog 4025
+MD5 720bffd73acf542e859034ca9d443c19 metadata.xml 244
+MD5 0bbdffc84e47f22daaf46c76e941a02a files/mtr-ac-res_mkquery.patch 510
 MD5 f809e2209338aeea9e409e8a7c17bc05 files/digest-mtr-0.64 60
+MD5 ed7a57f974bbb8a86b2fc02be7277c94 files/digest-mtr-0.67 60
+MD5 ce43e9fae32e2db595e780b4a4b2fcd8 files/digest-mtr-0.69 60
 MD5 cf3436006255ff4c602431f3a3eca98e files/digest-mtr-0.54-r2 131
-MD5 0bbdffc84e47f22daaf46c76e941a02a files/mtr-ac-res_mkquery.patch 510
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB/mbVKRy60XGEcJIRAsiDAJ0QQTLX9Ffi1ihLZG9hrfsTYUF7FwCgmJEs
-pmpWLGq5poeEuprRkYTvDqE=
-=mnob
------END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/files/digest-mtr-0.69 b/net-analyzer/mtr/files/digest-mtr-0.69
new file mode 100644
index 000000000000..609a70cb974a
--- /dev/null
+++ b/net-analyzer/mtr/files/digest-mtr-0.69
@@ -0,0 +1 @@
+MD5 58904d6d8d70114195cdeb653d56914c mtr-0.69.tar.gz 183216
diff --git a/net-analyzer/mtr/mtr-0.67.ebuild b/net-analyzer/mtr/mtr-0.67.ebuild
index c2d70f7bff7f..f728993ae334 100644
--- a/net-analyzer/mtr/mtr-0.67.ebuild
+++ b/net-analyzer/mtr/mtr-0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.67.ebuild,v 1.3 2005/01/31 17:11:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.67.ebuild,v 1.4 2005/02/02 11:18:13 ka0ttic Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,28 +13,39 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
 IUSE="gtk gtk2"
 
-DEPEND=">=sys-libs/ncurses-5.2
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( >=x11-libs/gtk+-2* ) )"
+DEPEND="dev-util/pkgconfig"
+RDEPEND=">=sys-libs/ncurses-5.2
+	gtk? (
+			!gtk2? ( =x11-libs/gtk+-1.2* )
+			gtk2? ( >=x11-libs/gtk+-2 )
+		)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+}
 
 src_compile() {
+	autoconf || die "autoconf failed"
+
 	local myconf
 	use gtk || myconf="${myconf} --without-gtk"
 
 	append-ldflags -Wl,-z,now
 
-	epatch ${FILESDIR}/mtr-ac-res_mkquery.patch
-	autoconf
-
 	econf ${myconf} \
-		`use_enable gtk2` || die
+		$(use_enable gtk2) \
+		|| die "econf failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die
+	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+
+	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
 
 	fowners root:wheel /usr/bin/mtr
 	fperms 4710 /usr/bin/mtr
diff --git a/net-analyzer/mtr/mtr-0.69.ebuild b/net-analyzer/mtr/mtr-0.69.ebuild
new file mode 100644
index 000000000000..840cd51eef5c
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.69.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69.ebuild,v 1.1 2005/02/02 11:18:13 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="My TraceRoute. 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 ~ppc ~s390 ~sparc ~x86"
+IUSE="gtk gtk2 ipv6"
+
+DEPEND="dev-util/pkgconfig"
+RDEPEND=">=sys-libs/ncurses-5.2
+	gtk? (
+			!gtk2? ( =x11-libs/gtk+-1.2* )
+			gtk2? ( >=x11-libs/gtk+-2 )
+		)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+}
+
+src_compile() {
+	autoconf || die "autoconf failed"
+
+	local myconf
+	use gtk || myconf="${myconf} --without-gtk"
+
+	append-ldflags -Wl,-z,now
+
+	econf ${myconf} \
+		$(use_enable gtk2) \
+		$(use_enable ipv6) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# this binary is universal. ie: it does both console and gtk.
+	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+
+	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
+
+	fowners root:wheel /usr/bin/mtr
+	fperms 4710 /usr/bin/mtr
+
+	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+}