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

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 20 insertions, 12 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/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 447b18d0d58e..dac01e889ce3 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -3,6 +3,6 @@ DIST traceroute-nanog_6.3.10.orig.tar.gz 34212 RMD160 84e925ded7e11233a2bbd6309e
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 RMD160 e9e21ed86dd401e5d69241b5942403d059d82c17 SHA1 23eb4dea45ce56a18c7366d22d3d1cb5f203d4d5 SHA256 840f517113cfc03cc708a7e58ef091b464f4876507488ea072df078795b8346b
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 RMD160 b265a5daebe41621b37da64b864437049fe94291 SHA1 6c8ac8495ac8abfcf298209d2e9a2bc57978ccef SHA256 86def604ea95df7c0b6787f6b3e41b10feab0756e16b49a7d2aeab9b02199168
 EBUILD traceroute-nanog-6.3.10-r1.ebuild 983 RMD160 eb76def7fea90517f9becb354bfd8529f6650b4b SHA1 816cabc060893ec4decb2cab793e9c4affa8b353 SHA256 b34abd0b643eacf53d578c43b7bea533e2fc1874ff6f92d879c879c76407b0c2
-EBUILD traceroute-nanog-6.4.2.ebuild 1057 RMD160 f55a6834a7dec49826341ca2bec54a24139c7f5c SHA1 8f60232419c42cf3e473a11218e02195acb1b906 SHA256 686aef418121877060c2a38538c7503969361fc6c45b07ecb5322368d8c9ea6f
-MISC ChangeLog 2999 RMD160 cc360a553b97fbcc99b2a2b28de9081f2fa09e93 SHA1 d2ae56012e832525e83fd7e88f28bb72eca57ef5 SHA256 c243e36d81c0d36111db6ce32fe045c3d11b7940ccc20409552c2024edb9427a
+EBUILD traceroute-nanog-6.4.2-r1.ebuild 1150 RMD160 e77e07181a789d61af5eaec460de1d380e8d8467 SHA1 08822fd658e2290303f6dcfc9d1a7473e6d1227e SHA256 9a9e4a69b1c6d48c62ba22831a2d3958c407cfb0d80fa8bdb346e9b9c8ac05fd
+MISC ChangeLog 3290 RMD160 b2152d9ab1a94a507d30933017bfe040fb907c3e SHA1 3bb74090fc89f96997b8ef5eca7ae610782478c9 SHA256 9c129786c2d7b96f517c23788f8dbfaa45330e65f06218f28016bb6866f7467c
 MISC metadata.xml 267 RMD160 783472a6902881884609679bb59b37ab2fb8d5d6 SHA1 05fe0741113d6bb5f87d3d617e74d29ede8f823c SHA256 0e96475f3fd4fb5bbadb2206048680a4ecf5eaa79bc8d94cd108e3781bcba6b4
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"
 }