Fix cross-compiling by Bertrand Jacquin (bug #374085). Set RDEPEND. Show notes only on first install.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 119 insertions, 6 deletions

diff --git a/net-analyzer/tcptrace/ChangeLog b/net-analyzer/tcptrace/ChangeLog
index 8765b0930bb1..382f87e066f8 100644
--- a/net-analyzer/tcptrace/ChangeLog
+++ b/net-analyzer/tcptrace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/tcptrace
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/ChangeLog,v 1.23 2010/07/26 22:56:17 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/ChangeLog,v 1.24 2013/06/09 14:40:14 jer Exp $
+
+*tcptrace-6.6.7-r1 (09 Jun 2013)
+
+  09 Jun 2013; Jeroen Roovers <jer@gentoo.org> +tcptrace-6.6.7-r1.ebuild,
+  +files/tcptrace-6.6.7-cross-compile.patch:
+  Fix cross-compiling by Bertrand Jacquin (bug #374085). Set RDEPEND. Show
+  notes only on first install.
 
   26 Jul 2010; Jeroen Roovers <jer@gentoo.org> tcptrace-6.6.7.ebuild:
   Set -DBSD_SOURCE by Nico Baggus (bug #325277).
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 61f91683bc72..23de630f2bf1 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,4 +1,16 @@
-DIST tcptrace-6.6.7.tar.gz 3773308 RMD160 1dd0f373f766322343ffad59d0655eba4c6682e0 SHA1 ae4d10a0829c57f2eda17e63f593e558f52b7f24 SHA256 63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd
-EBUILD tcptrace-6.6.7.ebuild 962 RMD160 8a5319ef43ff5c2002ee4abdcea18f9f50af511e SHA1 97d1c986fe15c37b3e0024064fd04d40fd8eed95 SHA256 72262ca4119b02cc29d2d62c5d51ecf46c33fbf2ba735518af5075ea26a5ca19
-MISC ChangeLog 2985 RMD160 ffb0cfb8bb30f18abb2d636cdc9a35d261251b35 SHA1 ab4f3a0e331dfda32e6a487e573e0f7287e9df93 SHA256 b2f666be939e606c6b1d71982249614bb232647bd2ce20028025052b14fcc83d
-MISC metadata.xml 236 RMD160 e0843414bf3459b68f1759d345c0aa531ba52644 SHA1 4c6ec70866782ac6629293c3aec3a1df0132998a SHA256 2919c75956af5b2e1e074eed85aed2281c9ac34a4e6ec8f6a826a14cbaa53021
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tcptrace-6.6.7-cross-compile.patch 1348 SHA256 c0285a211ceb6294de9d49c6da82a4379d948aa70be5b166c9f1f530120e180c SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e WHIRLPOOL 1b93660fed76ba09361f6f6ebedbd56545d47297ff2a1472d20a9d8a429bf0798bf357e6239017b25163fdd98ec4c5c3563a3a77f66530ee0d9267841fdbe00d
+DIST tcptrace-6.6.7.tar.gz 3773308 SHA256 63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432 WHIRLPOOL b7eb2373b9a26789c47bb05e1e45047164648ff6f5cb3b57ba552d205443ca1fba7df9dd983a68f712a3e7398e776d97b328463f2497e7e39ba2b7db789c14b0
+EBUILD tcptrace-6.6.7-r1.ebuild 1102 SHA256 c7111a2eb24fcc833370a773ae40ba417f8500878af19358304e89b2d2cd16e8 SHA512 b58711df6e6df3c4ef6ec83e77210d71c77f95b985f36fb9e3f1ad42e02524008140c0b8b5e2b91f0afd4d7bc6152c6d76b5b0e2dc993c24a21e2382dae29586 WHIRLPOOL 49dd0b764716d559580a2b33b68f45257080f2a0ec54a9059ac16f0e1f39df54edcb8104c358234a7566429f6b37d770e4ce39c9ee108d87e68460e3f19920b5
+EBUILD tcptrace-6.6.7.ebuild 962 SHA256 72262ca4119b02cc29d2d62c5d51ecf46c33fbf2ba735518af5075ea26a5ca19 SHA512 52ce3633250267953fc18971f01022279510d3724068d949525e100c1ec29f75a075d90f118d6d8582cc5247cdf85005cb6edcf98cd12259728e426b75d0c218 WHIRLPOOL 2e4c9e5592740b5a161c2e03540c89ac2537debf0acef98917e26488b2b3a8ad1713036980e03b79631c1ca5028af40ef1a4de85634ea893eb325ec1c5a46087
+MISC ChangeLog 3245 SHA256 0dda55bec005a7dfa71a6579433b3a06f2f50f9947b70fc2ef89b86efd01e05e SHA512 f111b09bbd3ceffa791849af368a1c2639a1823892c497de0c1fe5221e88a77d3098a4c337679f50abe5651fd3e83a473a397aff1aea54149c4104ecc35c8e32 WHIRLPOOL 3e8cab20b7c5a5e8096f5a6fb81a6d0a54a8b8d60986508aee13259851f8483db89ec1819b271716285dcdfe019265894a1fb4ba795c37cc63c345b77ca2592b
+MISC metadata.xml 236 SHA256 2919c75956af5b2e1e074eed85aed2281c9ac34a4e6ec8f6a826a14cbaa53021 SHA512 ef556f8764c396040a958a509baabc89b7fa7dbc4c936dd9367fa28c987c76d8a10eefdfb2b8d154436789d2f7ceda749259e5d3147d7410e2725a3ab30a9db3 WHIRLPOOL 3837b238ffcbacd8f9f4236899db948b7ab45697e35d736d27b0055cffbd1719555283fc735559e42f5a575631711bb234ca3538cd6f3abda42dc437848bba2a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlG0k88ACgkQVWmRsqeSphO/KwCfe4kPkD1Zz6cqoy9qjbHUegQU
+dgwAn2Zk3Zj1qfnQ7IKhOFX1RbLqFmw7
+=YOLM
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch b/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch
new file mode 100644
index 000000000000..a5b9ba0c009b
--- /dev/null
+++ b/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,8 +3,6 @@
+ 
+ AC_CANONICAL_SYSTEM
+ 
+-AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+@@ -43,13 +41,12 @@
+ dnl check for the IPv6 routines inet_pton
+ AC_CHECK_FUNCS(inet_pton)
+ 
+-AC_MSG_CHECKING(how to print unsigned long long)
+-AC_SUBST(FS_ULL)
+ dnl AC_TRY_RUN is a test program that performs a run-time test to find out
+ dnl the correct syntax to print unsigned long long ints in printf stmts.
+ dnl If strcmp returns 0, we are on an enironment that uses %llu, otherwise
+ dnl we are on a MacOSX environment that uses %qu
+-AC_TRY_RUN([
++AC_CACHE_CHECK([how to print unsigned long long], ac_cv_unsigned_long_long_printf_format,
++  [AC_TRY_RUN([
+ #include <stdio.h>
+ 
+ #define NIX "%llu"
+@@ -63,11 +60,17 @@
+      exit (0);
+   else
+      exit (1);
+-}],
+-AC_DEFINE(USE_LLU)
+-AC_MSG_RESULT(%llu), 
+-AC_MSG_RESULT(%qu),
+-AC_MSG_ERROR(can not run test program while cross compiling))
++}
++    ],
++    ac_cv_unsigned_long_long_printf_format=%llu,
++    ac_cv_unsigned_long_long_printf_format=%qu,
++    [AS_ECHO_N(["cross-comiling, assuming "])]
++    ac_cv_unsigned_long_long_printf_format=%llu
++  )]
++)
++AS_IF([test $ac_cv_unsigned_long_long_printf_format = %llu],
++  AC_DEFINE(USE_LLU)
++)
+ 
+ dnl Grab standard includes under weird Linux versions
+ dnl case "$target_os" in
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7-r1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7-r1.ebuild
new file mode 100644
index 000000000000..0db6c42977b4
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/tcptrace-6.6.7-r1.ebuild,v 1.1 2013/06/09 14:40:14 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${P}.tar.gz
+	http://www.tcptrace.org/download/old/6.6/${P}.tar.gz
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	eautoreconf
+	append-flags -D_BSD_SOURCE
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}