Fix building with make >= 3.82 wrt #337912 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 27 insertions, 5 deletions

diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index 2e6f55186ca1..cce232cc75a1 100644
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/traceroute
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.75 2010/07/15 17:19:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.76 2010/09/25 11:50:32 ssuominen Exp $
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  traceroute-2.0.15.ebuild, +files/traceroute-2.0.15-make-382.patch:
+  Fix building with make >= 3.82 wrt #337912 by Diego E. Pettenò.
 
 *traceroute-2.0.15 (15 Jul 2010)
 
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 6db8113d0719..f0b366bd31c0 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,4 @@
+AUX traceroute-2.0.15-make-382.patch 305 RMD160 8d1aa1d9a1031d88b7ac76191ec2872b70a61887 SHA1 3cb1a73f75dfdc10a11b809c5706595a57f79197 SHA256 3d86a169c36a9bac4bf1ecb39e4c47ed29e87a80e995a64b36ee2c7e4aab30d5
 AUX traceroute-2.0.8-prestrip.patch 310 RMD160 7e58baf090ba9375746bb8da592c0c7f8a2f3497 SHA1 9e872ab36ed2f56a7ace67bb7a6c8edea033a57b SHA256 efb0847bd3a74cbc87ca1665466c20f02c113ae56239ce26896daac5f612914e
 DIST traceroute-2.0.11.tar.gz 59873 RMD160 ea936ae224e5df8a8af0cfe492e83e6facd91838 SHA1 c6f540404ea6722cad23a60e041629e97fce4ec4 SHA256 f8f83e1228029d606991db825d776e2f473886955ec839301b19d09141f16d87
 DIST traceroute-2.0.12.tar.gz 63471 RMD160 dfe30859971b4df4d292fc40b79f85b2a8681aba SHA1 60cef943e6a3c42a3e8ddf50a5826496363cb0a1 SHA256 d9609699982ac500cf361a34bd0685a1e5d71d001b6087e4eb68236048ff078f
@@ -8,6 +9,6 @@ EBUILD traceroute-2.0.11.ebuild 906 RMD160 5b6eea14ae6bee2dd2dd4aec87338d4a29edb
 EBUILD traceroute-2.0.12.ebuild 808 RMD160 4762427528cf9aa49bf6fdc6d09a9841485c6faf SHA1 0a11bade398b8b164bd706abc3d270e981d1c2cc SHA256 2d57d9c76c3359d7035ab04e67b1d354fac41ea427387831ca8a06e8d1681f11
 EBUILD traceroute-2.0.13.ebuild 816 RMD160 969ae1dc3c7d38cbd9e24481ca52d02412812274 SHA1 23923f098d7a17d6a22de01b94a3b817e433acb5 SHA256 ef08430e86a494715c7e76ea2f84b9071f1668f0aa23fedd64f27dcd8a22aa07
 EBUILD traceroute-2.0.14.ebuild 816 RMD160 3f705a6aeea21e81978949367013da8a3939efcb SHA1 70f613b5be6fd4ea7360080732ef81c4a7efca59 SHA256 633084333221b6b25e69147794c178d47f09b13e29dee8ca9db469b9c119d009
-EBUILD traceroute-2.0.15.ebuild 816 RMD160 95ef940052e3973d0e15b06f142dccaa12104d24 SHA1 5ca3f52e724ce62616cdb76b886319c5db28aab0 SHA256 8fa82e020a3406e6400bab5f14ae189206bb04f4b105fff4b091d5cbfabbf077
-MISC ChangeLog 11595 RMD160 adc428457e9b024b3c07064452e49151dfc963c1 SHA1 4727c6e134bfe46e601e2943d99de69b280a1216 SHA256 4bb3dc321f497ee3c502aa97712362b9cc7380d31ecf72e89bdfc8f89531db51
+EBUILD traceroute-2.0.15.ebuild 897 RMD160 f3ed386d836bcbdb170453e2089f58436e155d67 SHA1 92c5407d804e8ac7fb9d351eae97d84a899179bb SHA256 b0d7a754ae00b4ec4fb7f61952df984cdf0814329afcfec365fdb388ebaeac33
+MISC ChangeLog 11792 RMD160 4fc2ff6c783716c5f8be1cc68008e50311892eb7 SHA1 f82984a1f2c35d4cf80df60572742008907c92da SHA256 29eb5a7add6aebe19713961ad0cc25c1e80306e0f53d93f4c63ec2ad45081c83
 MISC metadata.xml 235 RMD160 de3c26bbe3899e398acc788b01189adf8487038e SHA1 9fb34087c3a46253187189f3961acb78e92e84d4 SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e
diff --git a/net-analyzer/traceroute/files/traceroute-2.0.15-make-382.patch b/net-analyzer/traceroute/files/traceroute-2.0.15-make-382.patch
new file mode 100644
index 000000000000..f9a5752064e4
--- /dev/null
+++ b/net-analyzer/traceroute/files/traceroute-2.0.15-make-382.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/337912
+
+--- default.rules
++++ default.rules
+@@ -188,6 +188,6 @@
+ @mkdir -p $(DESTDIR)$(mandir)/man$(patsubst .%,%,$(suffix $(1)))
+ 	cp -f $(1) $(DESTDIR)$(mandir)/man$(patsubst .%,%,$(suffix $(1)))
+ 	
+-endef
+ 	$(foreach man,$(install_manuals),$(call inst_man,$(man)))
++endef
+ endif
diff --git a/net-analyzer/traceroute/traceroute-2.0.15.ebuild b/net-analyzer/traceroute/traceroute-2.0.15.ebuild
index f877e6c61a5b..78e9ed40516a 100644
--- a/net-analyzer/traceroute/traceroute-2.0.15.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.15.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.15.ebuild,v 1.1 2010/07/15 17:19:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.15.ebuild,v 1.2 2010/09/25 11:50:32 ssuominen Exp $
 
-inherit flag-o-matic toolchain-funcs
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Utility to trace the route of IP packets"
 HOMEPAGE="http://traceroute.sourceforge.net/"
@@ -13,6 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch
+}
+
 src_compile() {
 	use static && append-ldflags -static
 	tc-export CC AR RANLIB