Do not hardcode better values in Makefile.in either, but set them in the emake env. Change program name in man page thanks to Džen (bug #318823) and install man page without version suffix.

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

3 files changed, 87 insertions, 3 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index 1b89999c7aeb..575419ddda0b 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2009/12/23 14:02:25 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.49 2010/05/11 04:08:17 jer Exp $
+
+*hping-3_pre20051105-r2 (11 May 2010)
+
+  11 May 2010; Jeroen Roovers <jer@gentoo.org>
+  +hping-3_pre20051105-r2.ebuild:
+  Do not hardcode better values in Makefile.in either, but set them in the
+  emake env. Change program name in man page thanks to Džen (bug #318823)
+  and install man page without version suffix.
 
   23 Dec 2009; Jeroen Roovers <jer@gentoo.org>
   hping-3_pre20051105-r1.ebuild, +files/hping-3_pre20051105-libtcl.patch:
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index c8c6bfd5de40..0a55539f9d69 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -11,6 +11,7 @@ DIST hping3-20051105.tar.gz 584001 RMD160 e4ec209228b5cb99e2d561c5a7b1c82ff8abe5
 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 1439 RMD160 8434160269260521030dc4294ce2fedb6659b266 SHA1 08ba54de67b0809b3d5f06357304c7b303f1cde7 SHA256 24eb5387dcc543a49cfdb9c277987eb7ed32e9b378b0096256f22d7c3a52c1b3
+EBUILD hping-3_pre20051105-r2.ebuild 1701 RMD160 3387f144eda1d68e490e2c30013e2db616ebe7c6 SHA1 998bb98cd0943a29e9359fd86d422e20def7bee9 SHA256 b94c57911e3c4062c98a9989a3f45f8fb83017c896daf31ade4040a09f740367
 EBUILD hping-3_pre20051105.ebuild 1323 RMD160 21b98a4c18325440b2b565df8b90513fd4b91615 SHA1 04b0bb8c0b8e1f45fa83efede58ab48c70ac02eb SHA256 82807e3616b709e8b754d9abd543e18e4fbc57c212d62bc843bd32a23babd2e0
-MISC ChangeLog 6830 RMD160 cc548fcfd68db93859c28010413403bf65844ef0 SHA1 5281b4385555bedc02da4cabdd80217c642270af SHA256 7ff6423449741bfe9c91c4e4b53a92cff4b89aa3f921123eaf5b648544008172
+MISC ChangeLog 7148 RMD160 1c7bc5a9f8612055704c844ee52fee93a97eaf31 SHA1 a58ef5281f1b936234ac4a326c6665adcfb4bf6a SHA256 83672e7ecb29f5ae6294ce0b868ec7317ccc884933e376f85bfca2417f22ac01
 MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf
diff --git a/net-analyzer/hping/hping-3_pre20051105-r2.ebuild b/net-analyzer/hping/hping-3_pre20051105-r2.ebuild
new file mode 100644
index 000000000000..eef813b96908
--- /dev/null
+++ b/net-analyzer/hping/hping-3_pre20051105-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r2.ebuild,v 1.1 2010/05/11 04:08:16 jer Exp $
+
+EAPI="2"
+
+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"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="net-libs/libpcap
+	tcl? ( dev-lang/tcl )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}.patch \
+		"${FILESDIR}"/bytesex.h.patch \
+		"${FILESDIR}"/${P}-tcl.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-libtcl.patch
+
+	# Correct hard coded values
+	sed -i Makefile.in \
+		-e '/^CC=/d' \
+		-e '/^AR=/d' \
+		-e '/^RANLIB=/d' \
+		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
+		-e 's:-O2:$(CFLAGS):' \
+		|| die "sed Makefile.in failed"
+	
+	# Change name from hping2 to hping3
+	sed -i docs/hping3.8 \
+		-e 's|HPING2|HPING|g' \
+		-e 's|hping2|hping|g' \
+		|| die "sed hping3.8 failed"
+}
+
+src_configure() {
+	myconf=""
+	use tcl || myconf="--no-tcl"
+
+	# Not an autotools type configure:
+	sh configure ${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		DEBUG="" \
+		"CFLAGS=${CFLAGS}" \
+		"CC=$(tc-getCC)" \
+		"AR=$(tc-getAR)" \
+		"RANLIB=$(tc-getRANLIB)" \
+		"LIBDIR=$(get_libdir)" \
+		|| die "emake failed"
+}
+
+src_install () {
+	dosbin hping3
+	dosym /usr/sbin/hping3 /usr/sbin/hping
+	dosym /usr/sbin/hping3 /usr/sbin/hping2
+
+	newman docs/hping3.8 hping.8
+
+	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
+}