Fix man page wrt bug #191293 thanks to Mikael Magnusson. Also fix prestripped binaries wrt bug #191389

(Portage version: 2.1.3.7)

4 files changed, 23 insertions, 2 deletions

diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index 93fd265c7a69..aa0ec5982a53 100644
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/traceroute
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.45 2007/09/05 14:44:11 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.46 2007/09/06 09:02:54 jokey Exp $
+
+*traceroute-2.0.8-r1 (06 Sep 2007)
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/traceroute-2.0.8-prestrip.patch, -traceroute-2.0.8.ebuild,
+  +traceroute-2.0.8-r1.ebuild:
+  Fix man page wrt bug #191293 thanks to Mikael Magnusson. Also fix
+  prestripped binaries wrt bug #191389
 
   05 Sep 2007; Roy Marples <uberlord@gentoo.org> traceroute-2.0.8.ebuild:
   Version 2 looks like it's Linux only, so FreeBSD keywords are dropped.
diff --git a/net-analyzer/traceroute/files/digest-traceroute-2.0.8 b/net-analyzer/traceroute/files/digest-traceroute-2.0.8-r1
index d70ea44f5abd..d70ea44f5abd 100644
--- a/net-analyzer/traceroute/files/digest-traceroute-2.0.8
+++ b/net-analyzer/traceroute/files/digest-traceroute-2.0.8-r1
diff --git a/net-analyzer/traceroute/files/traceroute-2.0.8-prestrip.patch b/net-analyzer/traceroute/files/traceroute-2.0.8-prestrip.patch
new file mode 100644
index 000000000000..a0b6822660cf
--- /dev/null
+++ b/net-analyzer/traceroute/files/traceroute-2.0.8-prestrip.patch
@@ -0,0 +1,11 @@
+--- ./Make.rules.orig	2007-08-29 16:37:23.000000000 +0200
++++ ./Make.rules	2007-09-06 10:54:37.502085380 +0200
+@@ -48,7 +48,7 @@
+ gcc = $(findstring gcc,$(CC))
+ $(call set, CFLAGS, $(if $(gcc), -O2 -Wall, -O))
+ $(call set, CPPFLAGS, )
+-$(call set, LDFLAGS, -s)
++$(call set, LDFLAGS, )
+ $(call set, LIBS, )
+ 
+ 
diff --git a/net-analyzer/traceroute/traceroute-2.0.8.ebuild b/net-analyzer/traceroute/traceroute-2.0.8-r1.ebuild
index 45540cd1c08b..a9edf61fc98d 100644
--- a/net-analyzer/traceroute/traceroute-2.0.8.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.8.ebuild,v 1.2 2007/09/05 14:44:11 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.8-r1.ebuild,v 1.1 2007/09/06 09:02:54 jokey Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -18,6 +18,7 @@ DEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-prestrip.patch
 	use static && append-ldflags -static
 }
 
@@ -31,6 +32,7 @@ src_install() {
 		DESTDIR="${D}" \
 		prefix="/usr" \
 		libdir="/usr/$(get_libdir)" \
+		mandir="/usr/share/man" \
 		install \
 		|| die
 	dodoc ChangeLog CREDITS README TODO