Add tcl8.5 patch (stupid configure script). Respect LDFLAGS. Call epatch just once. Call sed just once. Respect libdir. Do not call econf but configure. Readd mysteriously disappearing keywords.

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

6 files changed, 109 insertions, 7 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index eec629c44ebf..26e263d10989 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/hping
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.44 2007/09/06 16:42:08 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.45 2009/12/22 20:26:02 jer Exp $
+
+*hping-3_pre20051105-r1 (22 Dec 2009)
+
+  22 Dec 2009; Jeroen Roovers <jer@gentoo.org> hping-3_pre20051105.ebuild,
+  +hping-3_pre20051105-r1.ebuild, +files/hping-3_pre20051105-ldflags.patch,
+  +files/hping-3_pre20051105-tcl.patch:
+  Add tcl8.5 patch (stupid configure script). Respect LDFLAGS. Call epatch
+  just once. Call sed just once. Respect libdir. Do not call econf but
+  configure. Readd mysteriously disappearing keywords.
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -hping-2.0.0_rc2-r1.ebuild,
   -hping-2.0.0_rc3.ebuild:
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index c833fea3f2b6..7250b2e29b0e 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,10 +1,13 @@
 AUX bytesex.h.patch 648 RMD160 296cbac7c2923ac58ed0fe3c17ad38825b18872d SHA1 c29be23c05a1abb41c4efe625000de01a947e4f0 SHA256 e994c326fc85928b6cde34eebf3c21fe6597ca3e7fd1d772d629949ddb20bf68
+AUX hping-3_pre20051105-ldflags.patch 674 RMD160 677cfc3e1e05d760a7740eacd82b3513bb7878de SHA1 92e910de467ee708fce9d39db7bd9d6a12a75015 SHA256 e544623ffae1dbf33617dd572573d82366b14104c683740f63d9d77daaf7fe59
+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
 AUX wlan-header-fix.patch 848 RMD160 863ba8aa88e7f89508ca508155fc9cc71b74ab1b SHA1 749b3f2375d7e628f4da95ef3a1d5c7a5dd8745b SHA256 18bce2131eda477f670b1c8352f14676892b853b65a1c106385895c4aa180ce0
 DIST hping2.0.0-rc3.tar.gz 124573 RMD160 345c6b29e48c2f9aea6b8bafb68c258f9ff8b083 SHA1 ec48293ca25e08155bf4b51ad6140b1be576a16f SHA256 f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964
 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-3_pre20051105.ebuild 1293 RMD160 e850f034e46453cdb2432d63f62d9a46ede5e8bc SHA1 4a7ab87958771d5083bc49274eacc8c68f511940 SHA256 19458a3137693f894ae17517c288071c32bf8855447408a1400fc51bdc581708
-MISC ChangeLog 5737 RMD160 200f5a81764b50ff7f79b7b01552efaa57e5c484 SHA1 a40c5e32eb64f508b80554a09002431f09727b16 SHA256 42e7c28cb2463194864e28c27172a41acb2ec7c3ed80faa97a440cc4b28788e6
+EBUILD hping-3_pre20051105-r1.ebuild 1468 RMD160 b512ec23779d0733988730562c8b7b0dbce914ed SHA1 05cfb89a49ed2fb5e4fc7e8865b8d7b1b0f1f032 SHA256 c717b21bfa110f89eeed42130b63a358d8cf59ca16269aeabfc6002108051ede
+EBUILD hping-3_pre20051105.ebuild 1323 RMD160 21b98a4c18325440b2b565df8b90513fd4b91615 SHA1 04b0bb8c0b8e1f45fa83efede58ab48c70ac02eb SHA256 82807e3616b709e8b754d9abd543e18e4fbc57c212d62bc843bd32a23babd2e0
+MISC ChangeLog 6167 RMD160 32dc2ed89e9232aedee72cb3cac2d82e1ed563d3 SHA1 b073e2763a6d1c58e2708204070854151b97886d SHA256 5c2ad045d376d6bbfe5442c454ede0872d697b0fda233abc4d636249d9c6cb82
 MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
new file mode 100644
index 000000000000..125db3345e02
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
@@ -0,0 +1,16 @@
+--- Makefile.in.org	2009-12-22 21:06:55.000000000 +0100
++++ Makefile.in	2009-12-22 21:09:17.000000000 +0100
+@@ -50,11 +50,11 @@
+ 	$(RANLIB) $@
+ 
+ hping3: byteorder.h $(OBJ)
+-	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
++	$(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
+ 	@echo
+ 
+ hping3-static: byteorder.h $(OBJ)
+-	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
++	$(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
+ 
+ byteorder.h:
+ 	./configure
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch
new file mode 100644
index 000000000000..ae1525b64fa4
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch
@@ -0,0 +1,11 @@
+--- configure.org	2009-12-22 21:05:11.000000000 +0100
++++ configure	2009-12-22 21:06:07.000000000 +0100
+@@ -63,7 +63,7 @@
+ #
+ for TCLPATH_TRY in "/usr/bin/" "/usr/local/bin/" "/bin/"
+ do
+-	for TCLVER_TRY in "8.4" "8.3" "8.2" "8.1" "8.0"
++	for TCLVER_TRY in "8.5" "8.4" "8.3" "8.2" "8.1" "8.0"
+ 	do
+ 		if [ -z $TCLSH ]
+ 		then
diff --git a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
new file mode 100644
index 000000000000..29f87150b579
--- /dev/null
+++ b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2009/12/22 20:26:02 jer Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV//_pre/-}"
+DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
+HOMEPAGE="http://www.hping.org"
+SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="tcl debug"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="net-libs/libpcap
+	tcl? ( dev-lang/tcl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}"/${P}.patch \
+		"${FILESDIR}"/bytesex.h.patch \
+		"${FILESDIR}"/${P}-tcl.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+
+	# Correct hard coded values
+	sed -i Makefile.in \
+		-e "9s:gcc:$(tc-getCC):" \
+		-e "10s:/usr/bin/ar:$(tc-getAR):" \
+		-e "11s:/usr/bin/ranlib:$(tc-getRANLIB):" \
+		-e "s:/usr/local/lib:/usr/$(get_libdir):g" \
+		-e "12s:-O2:${CFLAGS}:"
+}
+
+src_compile() {
+	myconf=""
+	use tcl || myconf="--no-tcl"
+
+	# Not an autotools type configure:
+	sh configure ${myconf} || die "configure failed"
+
+	if use debug; then
+		emake || die "make failed"
+	else
+		emake DEBUG="" || die "make failed"
+	fi
+}
+
+src_install () {
+	dosbin hping3
+	dosym /usr/sbin/hping3 /usr/sbin/hping
+	dosym /usr/sbin/hping3 /usr/sbin/hping2
+
+	doman docs/hping3.8
+
+	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
+}
diff --git a/net-analyzer/hping/hping-3_pre20051105.ebuild b/net-analyzer/hping/hping-3_pre20051105.ebuild
index 8f079c1f9389..5f1af9aaad46 100644
--- a/net-analyzer/hping/hping-3_pre20051105.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.4 2007/07/30 16:25:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105.ebuild,v 1.5 2009/12/22 20:26:02 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="tcl debug"
 
 S="${WORKDIR}/${MY_P}"