Build the Tcl linker arguments more reliably (bug #247282).

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

4 files changed, 27 insertions, 5 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index de4a81fd19ac..1b89999c7aeb 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/hping
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.47 2009/12/22 21:19:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.48 2009/12/23 14:02:25 jer Exp $
+
+  23 Dec 2009; Jeroen Roovers <jer@gentoo.org>
+  hping-3_pre20051105-r1.ebuild, +files/hping-3_pre20051105-libtcl.patch:
+  Build the Tcl linker arguments more reliably (bug #247282).
 
   22 Dec 2009; Jeroen Roovers <jer@gentoo.org> hping-2.0.0_rc3-r2.ebuild:
   Do not install COPYING. Break up long line.
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 393a0dc1c4ca..c8c6bfd5de40 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,6 +1,7 @@
 AUX bytesex.h.patch 648 RMD160 296cbac7c2923ac58ed0fe3c17ad38825b18872d SHA1 c29be23c05a1abb41c4efe625000de01a947e4f0 SHA256 e994c326fc85928b6cde34eebf3c21fe6597ca3e7fd1d772d629949ddb20bf68
 AUX hping-2.0.0_rc3-gentoo.patch 551 RMD160 47771b28c81b35ea53e336306ff799866be28568 SHA1 e735e877693d22c19c25e420b7246c8d76cda6d1 SHA256 16c409d71f28f9747bb81ab84f5a479685a5857b7f3b39d7cd85643e976b9c13
 AUX hping-3_pre20051105-ldflags.patch 674 RMD160 677cfc3e1e05d760a7740eacd82b3513bb7878de SHA1 92e910de467ee708fce9d39db7bd9d6a12a75015 SHA256 e544623ffae1dbf33617dd572573d82366b14104c683740f63d9d77daaf7fe59
+AUX hping-3_pre20051105-libtcl.patch 579 RMD160 5e25a4f4e75e335287372b87b3667b3cf5a5ee94 SHA1 d7f6ed8789b05f44123d16d07c4d493c74100f78 SHA256 dae42d02d5498fb27e86bf41c47d5bcec960c811ad3c6e8556c40aa84693d914
 AUX hping-3_pre20051105-tcl.patch 326 RMD160 10f4e4cd9f4db4eaed88fde458d7e9d1c3289182 SHA1 5387d407bf0ac765b55188253aba62fb09168426 SHA256 1640cc7e63ddfb27b182e79ca5ebbc8d611926142b7ac3de11d7afefaa11d4cf
 AUX hping-3_pre20051105.patch 1325 RMD160 d6d53199db63129102ca00497f184b488b25b3ee SHA1 f46d4f8836e39bb7bc817b1b28b1952ad8da258d SHA256 d1f52547424d4f169a809ccf371b2e5e75242054065342c7dc2633a78bfd6586
 AUX hping-bridge.patch 359 RMD160 9388d69c0b727c1afb7ffb92e3c5b5614c3ccd88 SHA1 1d735253d3e2f0bb560b6ae52badee51d52bc992 SHA256 28ab28f0956874492817378f21c46deef2b9186b804cd71006f0a833600edfa6
@@ -9,7 +10,7 @@ DIST hping2.0.0-rc3.tar.gz 124573 RMD160 345c6b29e48c2f9aea6b8bafb68c258f9ff8b08
 DIST hping3-20051105.tar.gz 584001 RMD160 e4ec209228b5cb99e2d561c5a7b1c82ff8abe540 SHA1 e13d27e14e7f90c2148a9b00a480781732fd351e SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8
 EBUILD hping-2.0.0_rc3-r1.ebuild 1070 RMD160 9226024f517a806c5ae452364cf92f5615a035dc SHA1 1f58a01a02a461f7719b5b955706261c4c59adbb SHA256 144f1d128fbcddd4394fe346ec1cc744dcba0f71d7c0b1a6998b091ccbb725f2
 EBUILD hping-2.0.0_rc3-r2.ebuild 1327 RMD160 2ceb0767499314bc99cdb9fc0451c4550550f98f SHA1 2ba1d713706923729fe59b685896b1e386eab4a5 SHA256 3f66deec5bf5ac17f29e59475eb25798c19fa7c58c673a1c9be9eb21701827ff
-EBUILD hping-3_pre20051105-r1.ebuild 1403 RMD160 4eee834297b703198bfe116422fd1cec337ad5f8 SHA1 561ef89358fc654d25b7cc8c2568c2321f862e4c SHA256 b8f2aee254e4e7a2bcbf3d81246450725e0d2fb8e060eb376eb971b21b92e320
+EBUILD hping-3_pre20051105-r1.ebuild 1439 RMD160 8434160269260521030dc4294ce2fedb6659b266 SHA1 08ba54de67b0809b3d5f06357304c7b303f1cde7 SHA256 24eb5387dcc543a49cfdb9c277987eb7ed32e9b378b0096256f22d7c3a52c1b3
 EBUILD hping-3_pre20051105.ebuild 1323 RMD160 21b98a4c18325440b2b565df8b90513fd4b91615 SHA1 04b0bb8c0b8e1f45fa83efede58ab48c70ac02eb SHA256 82807e3616b709e8b754d9abd543e18e4fbc57c212d62bc843bd32a23babd2e0
-MISC ChangeLog 6646 RMD160 ea77833483ab54030885a4d407941c561ef3154b SHA1 dc600b5246055bddf91f61f14b3e06123313b3b9 SHA256 de334a40fe4abee616a8c06ee79d384a5e9e1f78d58e3adadc2afa3b92520e87
+MISC ChangeLog 6830 RMD160 cc548fcfd68db93859c28010413403bf65844ef0 SHA1 5281b4385555bedc02da4cabdd80217c642270af SHA256 7ff6423449741bfe9c91c4e4b53a92cff4b89aa3f921123eaf5b648544008172
 MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch
new file mode 100644
index 000000000000..4d374cf06eaf
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch
@@ -0,0 +1,16 @@
+When anything libtcl (bug #247282) this will fail, and we're only finding out
+the version of the library anyway, so why not use TCL_VER, which is found using
+a slightly less fishy method. -JeR
+
+--- configure.org	2009-12-23 14:53:34.000000000 +0100
++++ configure	2009-12-23 14:56:34.000000000 +0100
+@@ -98,8 +98,7 @@
+ fi
+ if [ -n $USE_TCL ]
+ then
+-	LIBPOSTFIX=`ls -1 /usr/local/lib/ /usr/lib | grep 'libtcl[0-9]' | grep so | sed -e 's/\.so.*//g' -e 's/libtcl//g' | sort -r | head -1`
+-	TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread"
++	TCL_LIB="-ltcl${TCL_VER} -lm -lpthread"
+ fi
+ 
+ #
diff --git a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
index ed31c57c273d..b6794bd64ad1 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r1.ebuild,v 1.2 2009/12/22 21:17:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r1.ebuild,v 1.3 2009/12/23 14:02:25 jer Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -27,7 +27,8 @@ src_unpack() {
 		"${FILESDIR}"/${P}.patch \
 		"${FILESDIR}"/bytesex.h.patch \
 		"${FILESDIR}"/${P}-tcl.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-libtcl.patch
 
 	# Correct hard coded values
 	sed -i Makefile.in \