Respect LDFLAGS. Add a define to please the compiler. Install traceroute-nanog.genuine.8 thanks to Olivier Huber (bug #327227).

(Portage version: 2.2_rc67/cvs/Linux i686)

2 files changed, 18 insertions, 10 deletions

diff --git a/net-analyzer/traceroute-nanog/ChangeLog b/net-analyzer/traceroute-nanog/ChangeLog
index ff98771009e9..0933131674ea 100644
--- a/net-analyzer/traceroute-nanog/ChangeLog
+++ b/net-analyzer/traceroute-nanog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/traceroute-nanog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/ChangeLog,v 1.18 2010/07/06 14:41:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/ChangeLog,v 1.19 2010/07/07 16:58:44 jer Exp $
+
+*traceroute-nanog-6.4.2-r1 (07 Jul 2010)
+
+  07 Jul 2010; Jeroen Roovers <jer@gentoo.org>
+  -traceroute-nanog-6.4.2.ebuild, +traceroute-nanog-6.4.2-r1.ebuild:
+  Respect LDFLAGS. Add a define to please the compiler. Install
+  traceroute-nanog.genuine.8 thanks to Olivier Huber (bug #327227).
 
   06 Jul 2010; Jeroen Roovers <jer@gentoo.org>
   traceroute-nanog-6.3.10-r1.ebuild:
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
index b96e76531ba2..1eb09432026f 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2.ebuild,v 1.1 2010/07/06 14:35:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild,v 1.1 2010/07/07 16:58:44 jer Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs
 
@@ -17,22 +19,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
-
 S="${S}.orig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/${MY_P}-${DEB_PL}.diff"
+src_prepare() {
+	EPATCH_SUFFIX="dpatch" epatch "${WORKDIR}/${MY_P}-${DEB_PL}.diff" \
+		"${WORKDIR}/${P/.1}.orig/${P/.1/}/debian/patches/"
 }
 
 src_compile() {
-	$(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -lresolv -lm || die "Compile failed"
+	$(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \
+		|| die "Compile failed"
 }
 
 src_install() {
 	dosbin traceroute-nanog || die "dosbin failed"
 	dodoc 0_readme.txt faq.txt
-	newman ${P}/debian/traceroute-nanog.8 traceroute-nanog.8 || die "newman failed"
+	newman ${P}/debian/traceroute-nanog.genuine.8 traceroute-nanog.8 \
+		|| die "newman failed"
 }