Version Bump

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

4 files changed, 79 insertions, 9 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index a377cb548df0..233bb1761dde 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/mtr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.98 2010/07/24 15:36:40 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.99 2011/02/25 08:02:27 jlec Exp $
+
+*mtr-0.80 (25 Feb 2011)
+
+  25 Feb 2011; Justin Lecher <jlec@gentoo.org> +files/0.80-impl-dec.patch,
+  mtr-0.79.ebuild, +mtr-0.80.ebuild:
+  Version Bump
 
   24 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> mtr-0.79.ebuild:
   ppc64 stable wrt #327985
diff --git a/net-analyzer/mtr/files/0.80-impl-dec.patch b/net-analyzer/mtr/files/0.80-impl-dec.patch
new file mode 100644
index 000000000000..5b41a54c744b
--- /dev/null
+++ b/net-analyzer/mtr/files/0.80-impl-dec.patch
@@ -0,0 +1,12 @@
+diff --git a/gtk.c b/gtk.c
+index e42f4f6..333d7c8 100644
+--- a/gtk.c
++++ b/gtk.c
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #ifndef NO_GTK
+ #include <stdio.h>
diff --git a/net-analyzer/mtr/mtr-0.79.ebuild b/net-analyzer/mtr/mtr-0.79.ebuild
index 1cefeb77217c..3e939741f643 100644
--- a/net-analyzer/mtr/mtr-0.79.ebuild
+++ b/net-analyzer/mtr/mtr-0.79.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.79.ebuild,v 1.8 2010/07/24 15:36:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.79.ebuild,v 1.9 2011/02/25 08:02:27 jlec Exp $
 
 EAPI="2"
 
 inherit eutils autotools
 
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
-		mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
+SRC_URI="
+	ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
+	mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="gtk ipv6 suid"
 
-RDEPEND="sys-libs/ncurses
-	gtk? ( >=x11-libs/gtk+-2.4.0 )"
+RDEPEND="
+	sys-libs/ncurses
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	gtk? ( dev-util/pkgconfig )"
 
diff --git a/net-analyzer/mtr/mtr-0.80.ebuild b/net-analyzer/mtr/mtr-0.80.ebuild
new file mode 100644
index 000000000000..a1ca1e4ae36c
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.80.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.80.ebuild,v 1.1 2011/02/25 08:02:27 jlec Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+SRC_URI="
+	ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
+	mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gtk ipv6 suid"
+
+RDEPEND="
+	sys-libs/ncurses
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	gtk? ( dev-util/pkgconfig )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-impl-dec.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
+	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 #222909
+	AT_M4DIR="." eautoreconf
+}
+src_configure() {
+	econf \
+		$(use_with gtk) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fowners root:0 /usr/sbin/mtr
+	if use suid; then
+		fperms 4711 /usr/sbin/mtr
+	else
+		fperms 0710 /usr/sbin/mtr
+	fi
+	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
+}