Fix building with USE=-ipv6 thanks to Andrey Grozin, patch by Andrew Savchenko (bug #395031). Clean up inherit.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 50 insertions, 8 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 76348560efbd..d4aa10471fec 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.147 2011/12/16 17:35:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.148 2011/12/17 14:22:46 jer Exp $
+
+  17 Dec 2011; Jeroen Roovers <jer@gentoo.org> tcpdump-4.2.0.ebuild,
+  +files/tcpdump-4.2.0-ipv6.patch:
+  Fix building with USE=-ipv6 thanks to Andrey Grozin, patch by Andrew
+  Savchenko (bug #395031). Clean up inherit.
 
 *tcpdump-4.2.0 (16 Dec 2011)
 
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 064b333d3fdd..6875bb3c0614 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX tcpdump-4.0.0-ipv6-build.patch 288 RMD160 8e14d69d20dc2e431c6d10fc9ae694ab8976ebfb SHA1 a2e791b9612a7be04f882488e9d77e1f5c812a7e SHA256 c61cf785e854b44bfc015e4de6223051912547b0564bf61dbbfa97d1ddc4a63a
 AUX tcpdump-4.0.0-libsmi-autodep.patch 653 RMD160 5ac1093c524f83b4aaf21271d302e3acde2d8220 SHA1 e5cd061e6e5a918fa648b39aa0110f8ed043d8f1 SHA256 bdbd422f50b93f0c4232ae9cea0f4497976ab15559079575ec5ef1bca9dca72d
+AUX tcpdump-4.2.0-ipv6.patch 829 RMD160 c1aa07b33b5f124666c31bff509c9565e4672945 SHA1 5cb10869229d6c5b183933b2045004c98f9a5a3b SHA256 dfdfda533b7845089b79ccfa31445ed580694a6df18ee73dfe952f99596184e4
 AUX tcpdump-4.2.0-ppi.h 145 RMD160 18e03dde1a48dbbb4a8c114ce9a11660307af92e SHA1 658e84fd8cadbbe434d6b1f772384064095b32f4 SHA256 3cc039bf75aa4b9d3a2432d37c8f751c4e6d8c478361267ad37239871ff6c665
 DIST tcpdump-3.9.8.tar.gz 938054 RMD160 76b17d131f4d89342c2bcdc27c40d23d29ecb1f1 SHA1 98be9acb1e9154656838fcb89c4a36417cf56042 SHA256 2309c8eb1dc87436a410f4a8d041b0453ade5753c35ce7a2c5bc9a0263a8d299
 DIST tcpdump-4.1.1.tar.gz 1587392 RMD160 97ac07582f26c4126b09de1dcca6851ad02352d1 SHA1 8f356cbc781192ecb527623d68db90e06aa9d4b9 SHA256 e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a
@@ -10,13 +11,13 @@ DIST tcpdump-4.2.0.tar.gz 833172 RMD160 8981438e5a6a7b3bf5475e886625f015400e72c5
 EBUILD tcpdump-3.9.8-r1.ebuild 2235 RMD160 b1a1a5589297b50d9a0ed6319f8726c06fda651d SHA1 4a725909b6c2a884ec5c9390f98d3e63f98c7e97 SHA256 f75d0415b2c7a4175d66dca2da4b9442791cd68e391a5edeb54c5082bbe42785
 EBUILD tcpdump-3.9.8.ebuild 1908 RMD160 e1842d7bdfa207f74f2c164fcda84283780b3b42 SHA1 64b8be1fc9b2e1786836ebe42c343bdc7041fc3e SHA256 b5f1450e23d5cff9d9d3c57caf1dbaf8861e8867f97954c78a54d43f6bc78b56
 EBUILD tcpdump-4.1.1.ebuild 2231 RMD160 10002a9266e14faa1b13e9e573c94bb4cb4bb8f9 SHA1 2f57d70db22d425fdd600de41be00dc58f29402d SHA256 4bdfda05171c88db3b74bcd845e0d769b61f75d50c266dd8014347127a4cda54
-EBUILD tcpdump-4.2.0.ebuild 2296 RMD160 fc059b36037b9b59cb3e37a3ee4c878848371e52 SHA1 8bb9a58798081683672c01bac523ba84120aabeb SHA256 caf92eaa2ba01d8f66c81464e1d05024ec873661b0302ec1d913812e11e9ca57
-MISC ChangeLog 20304 RMD160 18406335fde62a92215ccad4ce235eb004102f96 SHA1 c83b312fcdafd00b7f7fe00e3614736d31583df9 SHA256 69b9703fb1d05a7dc555cd75ce12e91a02a6742556662862054f32a5403ca542
+EBUILD tcpdump-4.2.0.ebuild 2318 RMD160 8a441f383f7482f56402a7a3c7c47fc408836e0c SHA1 a84740af7f5bf6128902ae08f8f02c771bfb5d56 SHA256 1c1239ba8e0fd185ae1f8c0c49bb1a2b7444f5d6840bd80d758157822c5342c9
+MISC ChangeLog 20525 RMD160 4d410d73a028663cfe0a3345a4dc1d70f835c56c SHA1 4f31bcbc868c392f44c809e77d15e9b320a69fa9 SHA256 ba6b4f4662aba107aeee5cfc79994141df57e8ff7366121528d01740f19867d1
 MISC metadata.xml 465 RMD160 f9751964faf36897dbf01df6258c8af50791b1e5 SHA1 e4ed0caa1ba72d0827449bee5ce0e792940f3bfe SHA256 e8f218a9ee2e142e9b19c54bdc0e2b336cdccabaed8347a30956b663e6b9f51c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7rgVQACgkQVWmRsqeSphOOqACfbjQ6N7cE57nHy2xd0Vg9XKds
-UqIAnRj6yTDL815UCPBKMik+uPeIOYsL
-=p9CZ
+iEYEARECAAYFAk7spbsACgkQVWmRsqeSphPmlQCfZiMAAmXZ0kkiYAs9dRB22OXN
+TQwAn134DPimwuG9sQ0GlmEupss86vIL
+=DhNu
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch
new file mode 100644
index 000000000000..ba47b5daec1f
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch
@@ -0,0 +1,35 @@
+Fix compiling with USE=-ipv6 (bug #395031).
+https://bugs.gentoo.org/395031
+
+--- a/tcpdump-4.2.0/print-babel.c
++++ b/tcpdump-4.2.0/print-babel.c
+@@ -115,10 +115,14 @@
+ format_prefix(const u_char *prefix, unsigned char plen)
+ {
+     static char buf[50];
++#ifdef INET6
+     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
++#endif
+         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
++#ifdef INET6
+     else
+         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);
++#endif
+     buf[49] = '\0';
+     return buf;
+ }
+@@ -126,10 +130,14 @@
+ static const char *
+ format_address(const u_char *prefix)
+ {
++#ifdef INET6
+     if(memcmp(prefix, v4prefix, 12) == 0)
++#endif
+         return ipaddr_string(prefix + 12);
++#ifdef INET6
+     else
+         return ip6addr_string(prefix);
++#endif
+ }
+ 
+ static int
diff --git a/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
index 15191edd00dc..5c07ac352e93 100644
--- a/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild,v 1.1 2011/12/16 17:35:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild,v 1.2 2011/12/17 14:22:46 jer Exp $
 
 EAPI="4"
-inherit flag-o-matic toolchain-funcs eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -48,6 +48,7 @@ src_prepare() {
 	# http://sourceforge.net/tracker/?func=detail&aid=3444149&group_id=53066&atid=469573
 	# bug #393085
 	cp "${FILESDIR}"/${P}-ppi.h "${S}/ppi.h" || die
+	epatch "${FILESDIR}"/${P}-ipv6.patch
 }
 
 src_configure() {