summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-07-17 20:50:36 +0000
committerJeroen Roovers <jer@gentoo.org>2014-07-17 20:50:36 +0000
commit3345437fb4b42abc5bdf00f6d30387735ec9773b (patch)
tree5184bc1d767e42feb750310ff2b3489fd4f88777 /net-analyzer/thcrut
parentremove editor and shell support use flags for bug #516070 (diff)
downloadgentoo-2-3345437fb4b42abc5bdf00f6d30387735ec9773b.tar.gz
gentoo-2-3345437fb4b42abc5bdf00f6d30387735ec9773b.tar.bz2
gentoo-2-3345437fb4b42abc5bdf00f6d30387735ec9773b.zip
EAPI bump. Do not build against shipped pcre-3.9. Remove short <longdescription>.
(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/thcrut')
-rw-r--r--net-analyzer/thcrut/ChangeLog13
-rw-r--r--net-analyzer/thcrut/files/1.2.5-libnet.patch224
-rw-r--r--net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch42
-rw-r--r--net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch65
-rw-r--r--net-analyzer/thcrut/metadata.xml1
-rw-r--r--net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild30
-rw-r--r--net-analyzer/thcrut/thcrut-1.2.5.ebuild29
7 files changed, 148 insertions, 256 deletions
diff --git a/net-analyzer/thcrut/ChangeLog b/net-analyzer/thcrut/ChangeLog
index 0ecfb3bc49ca..87f85507cb53 100644
--- a/net-analyzer/thcrut/ChangeLog
+++ b/net-analyzer/thcrut/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-analyzer/thcrut
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/ChangeLog,v 1.12 2013/01/15 20:17:20 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/ChangeLog,v 1.13 2014/07/17 20:50:36 jer Exp $
+
+*thcrut-1.2.5-r1 (17 Jul 2014)
+
+ 17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -thcrut-1.2.5.ebuild,
+ +thcrut-1.2.5-r1.ebuild, -files/1.2.5-libnet.patch,
+ +files/thcrut-1.2.5-configure.patch, +files/thcrut-1.2.5-libnet.patch,
+ metadata.xml:
+ EAPI bump. Do not build against shipped pcre-3.9. Remove short
+ <longdescription>.
15 Jan 2013; Ulrich Müller <ulm@gentoo.org> thcrut-1.2.5.ebuild:
Fix LICENSE, bug 449954.
diff --git a/net-analyzer/thcrut/files/1.2.5-libnet.patch b/net-analyzer/thcrut/files/1.2.5-libnet.patch
deleted file mode 100644
index ef7f623e0a08..000000000000
--- a/net-analyzer/thcrut/files/1.2.5-libnet.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -U 0 src.orig/arp_main.c src/arp_main.c
---- src.orig/arp_main.c 2003-10-02 03:08:49.559975088 -0400
-+++ src/arp_main.c 2003-10-02 03:09:22.732932032 -0400
-@@ -18 +18 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/arpg.c src/arpg.c
---- src.orig/arpg.c 2003-10-02 03:08:49.560974936 -0400
-+++ src/arpg.c 2003-10-02 03:09:22.733931880 -0400
-@@ -12 +12 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/dhcp_main.c src/dhcp_main.c
---- src.orig/dhcp_main.c 2003-10-02 03:08:49.559975088 -0400
-+++ src/dhcp_main.c 2003-10-02 03:09:22.745930056 -0400
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/discover_dispatch.c src/discover_dispatch.c
---- src.orig/discover_dispatch.c 2003-10-02 03:08:49.560974936 -0400
-+++ src/discover_dispatch.c 2003-10-02 03:09:22.762927472 -0400
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/discover_main.c src/discover_main.c
---- src.orig/discover_main.c 2003-10-02 03:08:49.560974936 -0400
-+++ src/discover_main.c 2003-10-02 03:09:22.766926864 -0400
-@@ -8 +8 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/fp.h src/fp.h
---- src.orig/fp.h 2003-10-02 03:08:49.561974784 -0400
-+++ src/fp.h 2003-10-02 03:09:22.815919416 -0400
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/icmp_main.c src/icmp_main.c
---- src.orig/icmp_main.c 2003-10-02 03:08:49.559975088 -0400
-+++ src/icmp_main.c 2003-10-02 03:09:22.777925192 -0400
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/network_raw.c src/network_raw.c
---- src.orig/network_raw.c 2003-10-02 03:08:49.560974936 -0400
-+++ src/network_raw.c 2003-10-02 03:09:22.782924432 -0400
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/packets.c src/packets.c
---- src.orig/packets.c 2003-10-02 03:08:49.560974936 -0400
-+++ src/packets.c 2003-10-02 03:09:22.790923216 -0400
-@@ -6 +6 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/thcrut.c src/thcrut.c
---- src.orig/thcrut.c 2003-10-02 03:08:49.561974784 -0400
-+++ src/thcrut.c 2003-10-02 03:09:22.803921240 -0400
-@@ -87 +87 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/thcrut.h src/thcrut.h
---- src.orig/thcrut.h 2003-10-02 03:08:49.562974632 -0400
-+++ src/thcrut.h 2003-10-02 03:09:22.825917896 -0400
-@@ -7 +7 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/thcrut_libnet.c src/thcrut_libnet.c
---- src.orig/thcrut_libnet.c 2003-10-02 03:08:49.559975088 -0400
-+++ src/thcrut_libnet.c 2003-10-02 03:09:22.803921240 -0400
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-diff -U 0 src.orig/thcrut_libnet.h src/thcrut_libnet.h
---- src.orig/thcrut_libnet.h 2003-10-02 03:08:49.561974784 -0400
-+++ src/thcrut_libnet.h 2003-10-02 03:09:22.825917896 -0400
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- configure.orig 2003-10-02 03:06:36.083266632 -0400
-+++ configure 2003-10-02 03:08:01.425292672 -0400
-@@ -1275,2 +1274,1 @@
-- CCOPTS='-O2 -Wall'
-- CFLAGS="$CCOPTS"
-+ CCOPTS=""
-@@ -2148 +2148 @@
--LIBS="-lnet $LIBS"
-+LIBS="-lnet-1.0 $LIBS"
-@@ -2191,2 +2191,2 @@
-- CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-- LIBS="`libnet-config --libs` $LIBS"
-+ CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-+ LIBS="`libnet-1.0-config --libs` $LIBS"
-diff -U 0 src.orig/Makefile.in src/Makefile.in
---- src.orig/Makefile.in 2003-10-02 03:16:07.823348928 -0400
-+++ src/Makefile.in 2003-10-02 03:18:06.545300448 -0400
-@@ -243,7 +243 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h macvendor.h \
-+ macvendor.h \
-@@ -253,7 +247,2 @@
--arpg.o: arpg.c default.h ../config.h ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h thcrut.h state.h \
-+arpg.o: arpg.c default.h ../config.h \
-+ thcrut.h state.h \
-@@ -266,7 +255 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h thcrut.h state.h \
-+ thcrut.h state.h \
-@@ -276,7 +259 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h default.h \
-+ default.h \
-@@ -287,7 +264,2 @@
--discover_main.o: discover_main.c ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h default.h \
-+discover_main.o: discover_main.c \
-+ default.h \
-@@ -298,8 +270 @@
--fp.o: fp.c default.h ../config.h ../pcre-3.9/pcre.h fp.h \
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h
-+fp.o: fp.c default.h ../config.h ../pcre-3.9/pcre.h fp.h
-@@ -307,7 +272 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h network.h \
-+ network.h \
-@@ -320,7 +279 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h network_raw.h
-+ network_raw.h
-@@ -328,7 +281 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h state.h \
-+ state.h \
-@@ -338,7 +285 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h nmap_compat.h \
-+ nmap_compat.h \
-@@ -347,7 +288 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h state.h \
-+ state.h \
-@@ -367,7 +302 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h thcrut.h state.h \
-+ thcrut.h state.h \
-@@ -378,7 +307 @@
--thcrut_libnet.o: thcrut_libnet.c ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h
-+thcrut_libnet.o: thcrut_libnet.c
-@@ -387,7 +310 @@
-- ../Libnet-1.0.2a/include/libnet.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-headers.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-structures.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-macros.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-asn1.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-functions.h \
-- ../Libnet-1.0.2a/include/libnet/libnet-ospf.h state.h \
-+ state.h \
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
new file mode 100644
index 000000000000..daa069e22afd
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
@@ -0,0 +1,42 @@
+--- a/configure.in
++++ b/configure.in
+@@ -153,10 +153,8 @@
+ dnl libnet_init_packet only available in < libnet-1.1.x
+ dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet.
+ dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR))
+-AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no])
++AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no])
+ if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then
+- AC_CONFIG_SUBDIRS(Libnet-1.0.2a)
+- THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a"
+ CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}"
+ LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}"
+ PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '"
+@@ -164,14 +162,12 @@
+ dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+ dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
+ else
+- CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+- LIBS="`libnet-config --libs` $LIBS"
++ CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS"
++ LIBS="`libnet-1.0-config --libs` $LIBS"
+ fi
+
+ AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no])
+ if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then
+- AC_CONFIG_SUBDIRS(pcre-3.9)
+- THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9"
+ CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}"
+ LDFLAGS="-L../pcre-3.9 ${LDFLAGS}"
+ PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags"
+@@ -199,8 +195,8 @@
+ AC_OUTPUT(Makefile src/Makefile)
+
+ dnl Just to show the correct values...
+-CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+-LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
++CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
++LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS"
+
+ echo "THCrut has been configured with the following options:"
+ echo " User binaries: $B"
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
new file mode 100644
index 000000000000..87488c8c5196
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
@@ -0,0 +1,65 @@
+--- a/src/arp_main.c
++++ b/src/arp_main.c
+@@ -18 +18 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/arpg.c
++++ b/src/arpg.c
+@@ -12 +12 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/dhcp_main.c
++++ b/src/dhcp_main.c
+@@ -14 +14 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/discover_dispatch.c
++++ b/src/discover_dispatch.c
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/discover_main.c
++++ b/src/discover_main.c
+@@ -8 +8 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/fp.h
++++ b/src/fp.h
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/icmp_main.c
++++ b/src/icmp_main.c
+@@ -14 +14 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/network_raw.c
++++ b/src/network_raw.c
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/packets.c
++++ b/src/packets.c
+@@ -6 +6 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut.c
++++ b/src/thcrut.c
+@@ -87 +87 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut.h
++++ b/src/thcrut.h
+@@ -7 +7 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut_libnet.c
++++ b/src/thcrut_libnet.c
+@@ -5 +5 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut_libnet.h
++++ b/src/thcrut_libnet.h
+@@ -5 +5 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
index 1717aa521eaf..03aa50bab7e3 100644
--- a/net-analyzer/thcrut/metadata.xml
+++ b/net-analyzer/thcrut/metadata.xml
@@ -2,5 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>netmon</herd>
-<longdescription>Network discovery and fingerprinting tool</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..549294f28dd1
--- /dev/null
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild,v 1.1 2014/07/17 20:50:36 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Network discovery and fingerprinting tool"
+HOMEPAGE="http://www.thc.org/thc-rut/"
+SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+
+LICENSE="free-noncomm PCRE GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+DEPEND="
+ dev-libs/libpcre
+ net-libs/libnet:1.0
+ net-libs/libpcap
+"
+
+src_prepare() {
+ rm -r Libnet-1.0.2a pcre-3.9 || die
+ epatch \
+ "${FILESDIR}"/${P}-libnet.patch \
+ "${FILESDIR}"/${P}-configure.patch
+ eautoreconf
+}
+
+DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
diff --git a/net-analyzer/thcrut/thcrut-1.2.5.ebuild b/net-analyzer/thcrut/thcrut-1.2.5.ebuild
deleted file mode 100644
index 2700b6c881ef..000000000000
--- a/net-analyzer/thcrut/thcrut-1.2.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/thcrut-1.2.5.ebuild,v 1.12 2013/01/15 20:17:20 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="Network discovery and fingerprinting tool"
-HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
-
-LICENSE="free-noncomm PCRE GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
- <net-libs/libnet-1.1"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- rm -rf Libnet-1.0.2a
- epatch "${FILESDIR}"/${PV}-libnet.patch
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- dodoc ChangeLog FAQ README TODO thcrutlogo.txt
-}