6 files changed, 66 insertions, 8 deletions
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 559bb2774598..0e6662724bda 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.29 2004/11/30 20:22:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.30 2004/12/17 23:30:56 eldad Exp $
+
+*mtr-0.67 (18 Dec 2004)
+
+  18 Dec 2004; Eldad Zack <eldad@gentoo.org> mtr-0.54-r2.ebuild,
+  mtr-0.64.ebuild, +mtr-0.67.ebuild:
+  Version bump. Fixed lazy-binding suid issue.
 
   30 Nov 2004; Guy Martin <gmsoft@gentoo.org> mtr-0.64.ebuild:
   Stable on hppa.
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index db4c9df2c9a2..592aaf0f5035 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,7 +1,9 @@
-MD5 24ef5bc9885622c00e5bb018dec02772 ChangeLog 3223
-MD5 720bffd73acf542e859034ca9d443c19 metadata.xml 244
 MD5 76a50eb5847108e787bdfcdcd59be571 mtr-0.54-r2.ebuild 1112
+MD5 9c29fa48eedac9f24ce8e5b7a6de290d mtr-0.67.ebuild 1049
 MD5 9c29fa48eedac9f24ce8e5b7a6de290d mtr-0.64.ebuild 1049
-MD5 cf3436006255ff4c602431f3a3eca98e files/digest-mtr-0.54-r2 131
-MD5 f809e2209338aeea9e409e8a7c17bc05 files/digest-mtr-0.64 60
+MD5 24ef5bc9885622c00e5bb018dec02772 ChangeLog 3223
+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 cf3436006255ff4c602431f3a3eca98e files/digest-mtr-0.54-r2 131
diff --git a/net-analyzer/mtr/files/digest-mtr-0.67 b/net-analyzer/mtr/files/digest-mtr-0.67
new file mode 100644
index 000000000000..99a4f7737a12
--- /dev/null
+++ b/net-analyzer/mtr/files/digest-mtr-0.67
@@ -0,0 +1 @@
+MD5 76347197775ac604d7150ea01502a1df mtr-0.67.tar.gz 131393
diff --git a/net-analyzer/mtr/mtr-0.54-r2.ebuild b/net-analyzer/mtr/mtr-0.54-r2.ebuild
index 40b6e309bfd5..f7aed6011e77 100644
--- a/net-analyzer/mtr/mtr-0.54-r2.ebuild
+++ b/net-analyzer/mtr/mtr-0.54-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.54-r2.ebuild,v 1.7 2004/10/04 22:59:47 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.54-r2.ebuild,v 1.8 2004/12/17 23:30:56 eldad Exp $
+
+inherit flag-o-matic
 
 IUSE="gtk ipv6"
 
@@ -27,6 +29,7 @@ src_compile() {
 	local myconf
 	use gtk || myconf="${myconf} --without-gtk"
 
+	append-ldflags -Wl,-z,now
 	econf ${myconf} || die
 	emake || die
 }
diff --git a/net-analyzer/mtr/mtr-0.64.ebuild b/net-analyzer/mtr/mtr-0.64.ebuild
index a8517d1c1175..3fc76e8353da 100644
--- a/net-analyzer/mtr/mtr-0.64.ebuild
+++ b/net-analyzer/mtr/mtr-0.64.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.64.ebuild,v 1.7 2004/11/30 20:22:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.64.ebuild,v 1.8 2004/12/17 23:30:56 eldad Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -21,11 +21,14 @@ src_compile() {
 	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
+
 	emake || die
 }
 
diff --git a/net-analyzer/mtr/mtr-0.67.ebuild b/net-analyzer/mtr/mtr-0.67.ebuild
new file mode 100644
index 000000000000..532c63394bd3
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.67.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 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.1 2004/12/17 23:30:56 eldad 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"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* )
+		gtk2? ( >=x11-libs/gtk+-2* ) )"
+
+src_compile() {
+	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
+
+	emake || die
+}
+
+src_install() {
+	# this binary is universal. ie: it does both console and gtk.
+	make DESTDIR=${D} sbindir=/usr/bin install || die
+
+	fowners root:wheel /usr/bin/mtr
+	fperms 4710 /usr/bin/mtr
+
+	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+}