EAPI bump. Fix missing include, move log2 function to its own namespace, convert sed scripts to patch.

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

7 files changed, 114 insertions, 19 deletions

diff --git a/net-analyzer/hunt/ChangeLog b/net-analyzer/hunt/ChangeLog
index 59fdf24d3d12..07b7e10aac12 100644
--- a/net-analyzer/hunt/ChangeLog
+++ b/net-analyzer/hunt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/hunt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/ChangeLog,v 1.12 2012/01/17 18:21:28 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/ChangeLog,v 1.13 2014/07/12 14:29:33 jer Exp $
+
+*hunt-1.5-r2 (12 Jul 2014)
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> hunt-1.5-r1.ebuild,
+  +hunt-1.5-r2.ebuild, +files/hunt-1.5-exit.patch, +files/hunt-1.5-flags.patch,
+  +files/hunt-1.5-log2.patch:
+  EAPI bump. Fix missing include, move log2 function to its own namespace,
+  convert sed scripts to patch.
 
   17 Jan 2012; Jeroen Roovers <jer@gentoo.org> -hunt-1.5.ebuild:
   Old.
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index 486541b974fd..e9fcd9aeebb1 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST hunt-1.5.tgz 99241 RMD160 73be2d990036c7e1c82c8102ca7bef0b02d89def SHA1 3a772b1b9af58c566930ca67121e4a817b65a9a7 SHA256 a8a1978f3bd05ca3f01c168c13c9a09b1e1e9038c14fdfe43694c07fe3a0e328
-EBUILD hunt-1.5-r1.ebuild 851 RMD160 3ee829ca1b1515d8f116924bf48ee18a772187f2 SHA1 382b212c6deb0dc59e0db2ff96193e6d3bacdecf SHA256 d2700c15ce78633820a180c7f051d91514ec7b69a209bedcea31523f4fb51fb2
-MISC ChangeLog 1451 RMD160 9f8b96ef5587b486b376524a6c07ff2c111a890f SHA1 494b269ae797fc1a5835b7e340d5bcbae9be1bf9 SHA256 6cefe54357c944747a8d6e61e84d950ba86b630cebad00956322a12f9889563e
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+AUX hunt-1.5-exit.patch 208 SHA256 fcc6e917aebb727c60fd072b6cbd0fc1e73842044a19d24468402d9b1840a0af SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8 WHIRLPOOL b0023948fbcaa74c8c9d52a917e3613cf1d6f3c95f9021d3e26d02c7b8752a9a66dfe043946bbc9617813b9f1e0bdf2f8b8d20ea7a33ddb0219c121dccc913d7
+AUX hunt-1.5-flags.patch 507 SHA256 59c62e8b5a9a37b5f1304ecd6d50d583ee9ef65e8f61eedda8faefe0b6a5dec4 SHA512 2d354317438a387220089635aeda449a922746ce0b38b14b57bc0daf30f5216691a7c5098d569143e2b70bd7e8d7156b2a42423bca13c5e77c635f64d1804546 WHIRLPOOL 9144a5b86e4bf5e433fcca70aff6c93b9ca59d0fd4fb5344c7fad900b95a42a9e77227314bcab6a7b1f97243d75fbd6f227655b235296009eaf9d1422efd11e6
+AUX hunt-1.5-log2.patch 387 SHA256 8735c57e9224a20ee540b71fc709608a2614957565c3ecdd9de0c67c6c398c64 SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff WHIRLPOOL 2103e209ed0f81da71b06893af04bd39c883e82accb9ce1a1b83abe3018bc6b680248b4b0aa440bff84446175ed484bcdfc0eed84485705af5407229ea9d0a1b
+DIST hunt-1.5.tgz 99241 SHA256 a8a1978f3bd05ca3f01c168c13c9a09b1e1e9038c14fdfe43694c07fe3a0e328 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61 WHIRLPOOL 01b354797c83828899d5b957428f04e731e9edf12d601615d89bf70b55447cef9f65c4c9e5a5d6f7fcb5edb5fd49ad6942a88a5988866003b8e5a83045001b9c
+EBUILD hunt-1.5-r1.ebuild 781 SHA256 aa109a5419c37f95574965c42e37408165e2a145b97cfb05caded99f55acc434 SHA512 99d9065b68e2d8e113f919539c37c52ec9c3d4266fcd2833f2800556c30a040802f0db8326eeab1e223ca5c9f1af635d3052650c5dea71a800b678d1bf5f38b3 WHIRLPOOL 90dc4fe28737ae488cc9a6429e773602b36025b2ab7d49efa05ba938309b1a96c51beb7938add51de1cc3b26a7a05b65ef55bbdcfd52754e4939ab64aa2ad571
+EBUILD hunt-1.5-r2.ebuild 758 SHA256 9442225ef10455bd0f55fe181486b02ae2afd71f8cfa562161b02c7b568e6fb6 SHA512 f0c3d317df68241d796bb01c37817d18653868f7b6c2c79aa5dfbf1386c8dc38364f14605472579d10fcb913f54ad90ca5bffe6ed7487c9499ce3ef0634109a5 WHIRLPOOL 4c0ca1aebdff55f27b41d088d99a7f2cd391488cbe7003fc5659b23e811bf2bdc18bb6fe33a2ccf19dab36700e697ac768389ff4de65c11713ac2164a4a94ed6
+MISC ChangeLog 1764 SHA256 f84441b386ad60699e01a2743dbced43c309eea7b5dfb9bbeb413374f1e479c2 SHA512 722148da0c4572f8910391bfe3e6f90203a79ce311e659e584f361d1c0aef5b80fd50170e060f9223493b162ea4ca1ef5dac4d8de936b8391fcabd2f0ee2128c WHIRLPOOL 8b56984c8e692e7d72cea1f2c9f58c2c705538a340f11a5dd5c7accb8c7e1d6e16f20943d3e67cebdab490865854c13241d331fc3e228fe07425984413dde375
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk8VvC4ACgkQVWmRsqeSphOBZgCcDXcEXuqAuyIygxC503SgfX87
-qcsAniDkn7Ca1z8N/wrl2PO0ip54E3N2
-=dTWw
+iEYEAREIAAYFAlPBRk8ACgkQVWmRsqeSphMDiQCfTXGZWV/UDUVbSQNNHs9RWmG7
+ticAn17EMZNADpUVFAp9zRtK+fLKB9D5
+=AZId
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/hunt/files/hunt-1.5-exit.patch b/net-analyzer/hunt/files/hunt-1.5-exit.patch
new file mode 100644
index 000000000000..226093e1795a
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-exit.patch
@@ -0,0 +1,10 @@
+--- a/timer.c
++++ b/timer.c
+@@ -8,6 +8,7 @@
+  */
+ #include <stdio.h>
+ #include <unistd.h>
++#include <stdlib.h> /* exit() */
+ #include "hunt.h"
+ 
+ struct list timejob_list = LIST_INIT(struct timejob, j_next);
diff --git a/net-analyzer/hunt/files/hunt-1.5-flags.patch b/net-analyzer/hunt/files/hunt-1.5-flags.patch
new file mode 100644
index 000000000000..2ffcd823847e
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-flags.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,7 @@
+-CFLAGS=-Wall -O2 -g -D_REENTRANT
++CFLAGS += -I. -Wall -D_REENTRANT
+ #CFLAGS+=-DSYNC_FAST
+ #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR
+ 
+-LDFLAGS=
+ #LDFLAGS=-static
+ 
+ OBJ=hunt.o main.o c/list.o c/hash.o c/array.o util.o net.o \
+@@ -11,7 +10,7 @@
+ 	addpolicy.o options.o resolv.o timer.o pktrelay.o
+ 	
+ hunt: $(OBJ)
+-	$(CC) ${LDFLAGS} -o $@ $^ -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
+ 
+ hunt_static: $(OBJ)
+ 	$(CC) ${LDFLAGS} -static -o $@ $^ -lpthread
diff --git a/net-analyzer/hunt/files/hunt-1.5-log2.patch b/net-analyzer/hunt/files/hunt-1.5-log2.patch
new file mode 100644
index 000000000000..fc36eaea1f3b
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-log2.patch
@@ -0,0 +1,22 @@
+--- a/hunt.h
++++ b/hunt.h
+@@ -401,7 +401,7 @@
+ void set_tty_color_bg(enum TTY_COLOR fg, enum TTY_COLOR bg);
+ 
+ int is_power2(unsigned int i);
+-int log2(unsigned int i);
++int _hunt_log2(unsigned int i);
+ int count_mask(unsigned int mask);
+ 
+ 
+--- a/util.c
++++ b/util.c
+@@ -70,7 +70,7 @@
+ 	return i ? 0 : 1;
+ }
+ 
+-int log2(unsigned int i)
++int _hunt_log2(unsigned int i)
+ {
+ 	int l = 0;
+ 
diff --git a/net-analyzer/hunt/hunt-1.5-r1.ebuild b/net-analyzer/hunt/hunt-1.5-r1.ebuild
index 1a55966cc28f..de8e16116b57 100644
--- a/net-analyzer/hunt/hunt-1.5-r1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/hunt-1.5-r1.ebuild,v 1.3 2012/01/15 15:37:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/hunt-1.5-r1.ebuild,v 1.4 2014/07/12 14:29:33 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit toolchain-funcs
 
@@ -13,20 +13,18 @@ SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
 src_prepare() {
-cp -av Makefile{,.orig}
 	sed -i Makefile \
-		-e 's:^CFLAGS=:CFLAGS += -I.:g' \
+		-e 's:^CFLAGS=:CFLAGS += -I. :g' \
 		-e '/^LDFLAGS=/d' \
 		-e 's:${LDFLAGS}:$(LDFLAGS):g' \
 		-e 's:-O2 -g::' \
-		|| die "sed Makefile"
+		|| die
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die "emake"
+	emake CC=$(tc-getCC)
 }
 
 src_install() {
diff --git a/net-analyzer/hunt/hunt-1.5-r2.ebuild b/net-analyzer/hunt/hunt-1.5-r2.ebuild
new file mode 100644
index 000000000000..9cf3b9ff8781
--- /dev/null
+++ b/net-analyzer/hunt/hunt-1.5-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/hunt-1.5-r2.ebuild,v 1.1 2014/07/12 14:29:33 jer Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
+HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
+SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-exit.patch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-log2.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin hunt
+	doman man/hunt.1
+	dodoc CHANGES README* TODO tpsetup/transproxy
+}