removing a lot of old ebuilds and files, version bump to 2.4.0

(Portage version: 2.0.51.22-r2)

21 files changed, 42 insertions, 978 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 27751fc41065..15977493997f 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.72 2005/07/25 20:08:39 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.73 2005/07/29 04:06:17 vanquirius Exp $
+
+*snort-2.4.0 (29 Jul 2005)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/2.0.6-libnet-1.0.patch, -files/2.1.2-libnet-1.0.patch,
+  -files/snort-2.0.6-gcc3.patch, -files/snort-2.1.2-gcc3.patch,
+  -files/snort-2.1.3-gcc3.patch, -files/snort-drop-calculation.diff,
+  -snort-2.0.6.ebuild, -snort-2.1.3.ebuild, -snort-2.2.0.ebuild,
+  -snort-2.3.0_rc2.ebuild, -snort-2.3.0.ebuild, +snort-2.4.0.ebuild,
+  -snort-2.4.20050508.ebuild:
+  Removing ebuilds prior to 2.3.0 and 2.4.0 version bump.
 
   25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.3.3-r1.ebuild:
   Move snort user code from pkg_preinst to pkg_setup, changed it a bit. Fixes
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index b5dc43fa4134..bf8e980394b9 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,31 +1,15 @@
-MD5 f6d6531ed3eeae3536ad6c9d7283dceb snort-2.2.0.ebuild 4370
 MD5 45aadbffae0e3986ec20670571892242 snort-2.3.3.ebuild 4147
-MD5 0ee736821e1141642d8d94cd4d0f4b13 snort-2.0.6.ebuild 3121
 MD5 aea5be2e973264027fb5b16ec5750873 snort-2.3.0-r1.ebuild 4443
-MD5 698f0f4adeb7ab6a3f30e1cf9c9e89d5 snort-2.3.0.ebuild 4164
 MD5 07799883bb16ae40438da421735721c5 snort-2.3.3-r1.ebuild 4052
 MD5 9b2bebc98da0c3d9557772760ab3bcba snort-2.3.2.ebuild 4449
-MD5 dd314de61f3497fa360bebeb27422f36 snort-2.1.3.ebuild 4363
-MD5 e5dc3d5a6745cbd0ccfda56cf06450bf snort-2.4.20050508.ebuild 4048
-MD5 314fb6c0c09b741f68b77ade49e130b9 snort-2.3.0_rc2.ebuild 3970
+MD5 a6c135acd68b21d4dde49d6164191ddb snort-2.4.0.ebuild 3964
 MD5 5aa1ded51bb924fcb50bb36cbfb32ab0 ChangeLog 13946
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
-MD5 08107e2e3ce78a19d7df4c78b9461303 files/digest-snort-2.3.0_rc2 221
 MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
-MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
 MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
-MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
-MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
-MD5 a654db9256f89b77a9ce482c976dc896 files/digest-snort-2.2.0 129
-MD5 20c2ec2c963cca8c0abe1b6ee2b5b9f7 files/digest-snort-2.3.0 218
 MD5 5d26c971694357c500d666e68622a120 files/digest-snort-2.3.2 287
 MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
-MD5 60c507a31d5c83c9ddf7fde2a91a7bb8 files/digest-snort-2.4.20050508 208
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
+MD5 19b0308c62da87468000788dcc7f4ee2 files/digest-snort-2.4.0 205
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
 MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
diff --git a/net-analyzer/snort/files/2.0.6-libnet-1.0.patch b/net-analyzer/snort/files/2.0.6-libnet-1.0.patch
deleted file mode 100644
index c26fa717ba1c..000000000000
--- a/net-analyzer/snort/files/2.0.6-libnet-1.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig	2003-08-19 01:19:05.948824752 -0400
-+++ configure	2003-08-19 01:19:06.212784624 -0400
-@@ -6376 +6376 @@
--   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
-@@ -6382 +6382 @@
--  if test `libnet-config --cflags | wc -c` = "1"; then
-+  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-@@ -6387,3 +6387,3 @@
--  if test `libnet-config --libs | wc -c` = "1"; then
--    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
--echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
-+  if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
-+echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
-@@ -6395 +6395 @@
--    LIBS="${LIBS} -lnet"
-+    LIBS="${LIBS} -lnet-1.0"
-@@ -6400 +6400 @@
--for ac_header in libnet.h
-+for ac_header in libnet-1.0.h
-@@ -6533 +6533 @@
--    libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-@@ -6538 +6538 @@
--    if test -r $i/libnet.h; then
-+    if test -r $i/libnet-1.0.h; then
-@@ -6544 +6544 @@
--    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-@@ -6555 +6555 @@
--   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-@@ -6574 +6574 @@
--   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-@@ -6587,2 +6587,2 @@
--echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
--echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
-+echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
-@@ -6593 +6593 @@
--LIBS="-lnet  $LIBS"
-+LIBS="-lnet-1.0  $LIBS"
-@@ -6647 +6647 @@
--  LIBS="-lnet $LIBS"
-+  LIBS="-lnet-1.0 $LIBS"
---- src/detection-plugins/sp_react.c.orig	2003-08-19 01:19:06.106800736 -0400
-+++ src/detection-plugins/sp_react.c	2003-08-19 01:19:06.220783408 -0400
-@@ -56 +56 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- src/detection-plugins/sp_respond.c.orig	2003-08-19 01:19:06.111799976 -0400
-+++ src/detection-plugins/sp_respond.c	2003-08-19 01:19:06.225782648 -0400
-@@ -33 +33 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/snort/files/2.1.2-libnet-1.0.patch b/net-analyzer/snort/files/2.1.2-libnet-1.0.patch
deleted file mode 100644
index c26fa717ba1c..000000000000
--- a/net-analyzer/snort/files/2.1.2-libnet-1.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig	2003-08-19 01:19:05.948824752 -0400
-+++ configure	2003-08-19 01:19:06.212784624 -0400
-@@ -6376 +6376 @@
--   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
-@@ -6382 +6382 @@
--  if test `libnet-config --cflags | wc -c` = "1"; then
-+  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-@@ -6387,3 +6387,3 @@
--  if test `libnet-config --libs | wc -c` = "1"; then
--    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
--echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
-+  if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
-+echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
-@@ -6395 +6395 @@
--    LIBS="${LIBS} -lnet"
-+    LIBS="${LIBS} -lnet-1.0"
-@@ -6400 +6400 @@
--for ac_header in libnet.h
-+for ac_header in libnet-1.0.h
-@@ -6533 +6533 @@
--    libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-@@ -6538 +6538 @@
--    if test -r $i/libnet.h; then
-+    if test -r $i/libnet-1.0.h; then
-@@ -6544 +6544 @@
--    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-@@ -6555 +6555 @@
--   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-@@ -6574 +6574 @@
--   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-@@ -6587,2 +6587,2 @@
--echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
--echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
-+echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
-@@ -6593 +6593 @@
--LIBS="-lnet  $LIBS"
-+LIBS="-lnet-1.0  $LIBS"
-@@ -6647 +6647 @@
--  LIBS="-lnet $LIBS"
-+  LIBS="-lnet-1.0 $LIBS"
---- src/detection-plugins/sp_react.c.orig	2003-08-19 01:19:06.106800736 -0400
-+++ src/detection-plugins/sp_react.c	2003-08-19 01:19:06.220783408 -0400
-@@ -56 +56 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- src/detection-plugins/sp_respond.c.orig	2003-08-19 01:19:06.111799976 -0400
-+++ src/detection-plugins/sp_respond.c	2003-08-19 01:19:06.225782648 -0400
-@@ -33 +33 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/snort/files/digest-snort-2.0.6 b/net-analyzer/snort/files/digest-snort-2.0.6
deleted file mode 100644
index 8667ace13fcd..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51123744b4e5952e2bb4156c912adacc snort-2.0.6.tar.gz 1960326
-MD5 7fd78d7bb755227c5acec7bfecdb94f7 snort-prelude-reporting-patch-0.2.5.tar.gz 39277
diff --git a/net-analyzer/snort/files/digest-snort-2.1.3 b/net-analyzer/snort/files/digest-snort-2.1.3
deleted file mode 100644
index 02f5f6b2ba3a..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 76a538d27c23d51dbed43b04c06114e1 snort-2.1.3.tar.gz 2379344
-MD5 b515ee767b9889303e4a9b14dee5b078 snortsam-patch.tar.gz 29496
diff --git a/net-analyzer/snort/files/digest-snort-2.2.0 b/net-analyzer/snort/files/digest-snort-2.2.0
deleted file mode 100644
index da125d9c3643..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6194278217e4e3f733b046256a31f0e6 snort-2.2.0.tar.gz 2498466
-MD5 b515ee767b9889303e4a9b14dee5b078 snortsam-patch.tar.gz 29496
diff --git a/net-analyzer/snort/files/digest-snort-2.3.0 b/net-analyzer/snort/files/digest-snort-2.3.0
deleted file mode 100644
index bb07b37ca084..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 89cdc22af9516cbafc359b452819947e snort-2.3.0.tar.gz 2633245
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
diff --git a/net-analyzer/snort/files/digest-snort-2.3.0_rc2 b/net-analyzer/snort/files/digest-snort-2.3.0_rc2
deleted file mode 100644
index 2507641b7486..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0c980ae53823305bd58e651cb5fd1a41 snort-2.3.0RC2.tar.gz 2251772
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
diff --git a/net-analyzer/snort/files/digest-snort-2.4.0 b/net-analyzer/snort/files/digest-snort-2.4.0
new file mode 100644
index 000000000000..ee0e4b0dcc9a
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.4.0
@@ -0,0 +1,3 @@
+MD5 033e21190c5308fe69857908285feed1 snort-2.4.0.tar.gz 2126176
+MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
+MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
diff --git a/net-analyzer/snort/files/digest-snort-2.4.20050508 b/net-analyzer/snort/files/digest-snort-2.4.20050508
deleted file mode 100644
index 3104a65adb0e..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.20050508
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c83a4ef61f462ff83c6da922b5d4784a snort-2.4.20050508.tar.gz 2090957
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/files/snort-2.0.6-gcc3.patch b/net-analyzer/snort/files/snort-2.0.6-gcc3.patch
deleted file mode 100644
index 972aee39c74a..000000000000
--- a/net-analyzer/snort/files/snort-2.0.6-gcc3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur snort-2.0.2/src/util.h snort-2.0.2-gentoo/src/util.h
---- snort-2.0.2/src/util.h	2003-03-27 09:59:30.000000000 +1200
-+++ snort-2.0.2-gentoo/src/util.h	2003-10-10 02:11:41.000000000 +1300
-@@ -39,6 +39,8 @@
- #include "strlcpyu.h"
- #endif
- 
-+#include <sys/types.h>
-+
- extern u_long netmasks[33];
- 
- /* Self preservation memory control struct */
diff --git a/net-analyzer/snort/files/snort-2.1.2-gcc3.patch b/net-analyzer/snort/files/snort-2.1.2-gcc3.patch
deleted file mode 100644
index 972aee39c74a..000000000000
--- a/net-analyzer/snort/files/snort-2.1.2-gcc3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur snort-2.0.2/src/util.h snort-2.0.2-gentoo/src/util.h
---- snort-2.0.2/src/util.h	2003-03-27 09:59:30.000000000 +1200
-+++ snort-2.0.2-gentoo/src/util.h	2003-10-10 02:11:41.000000000 +1300
-@@ -39,6 +39,8 @@
- #include "strlcpyu.h"
- #endif
- 
-+#include <sys/types.h>
-+
- extern u_long netmasks[33];
- 
- /* Self preservation memory control struct */
diff --git a/net-analyzer/snort/files/snort-2.1.3-gcc3.patch b/net-analyzer/snort/files/snort-2.1.3-gcc3.patch
deleted file mode 100644
index 972aee39c74a..000000000000
--- a/net-analyzer/snort/files/snort-2.1.3-gcc3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur snort-2.0.2/src/util.h snort-2.0.2-gentoo/src/util.h
---- snort-2.0.2/src/util.h	2003-03-27 09:59:30.000000000 +1200
-+++ snort-2.0.2-gentoo/src/util.h	2003-10-10 02:11:41.000000000 +1300
-@@ -39,6 +39,8 @@
- #include "strlcpyu.h"
- #endif
- 
-+#include <sys/types.h>
-+
- extern u_long netmasks[33];
- 
- /* Self preservation memory control struct */
diff --git a/net-analyzer/snort/files/snort-drop-calculation.diff b/net-analyzer/snort/files/snort-drop-calculation.diff
deleted file mode 100644
index f246155611dd..000000000000
--- a/net-analyzer/snort/files/snort-drop-calculation.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- src/util.orig       2003-10-01 16:17:50.000000000 +0200
-+++ src/util.c  2003-10-01 16:20:27.000000000 +0200
-@@ -916,13 +916,13 @@
-             LogMessage("\n\n===================================="
-                     "===========================================\n");
-             LogMessage("Snort analyzed %d out of %d packets, ", 
--                    ps.ps_recv, ps.ps_recv+ps.ps_drop);
-+                    ps.ps_recv - ps.ps_drop, ps.ps_recv);
- 
-             if(ps.ps_recv)
-             {
-                 LogMessage("dropping %d(%.3f%%) packets\n\n", 
-                         ps.ps_drop, 
--                        CalcPct( (float) ps.ps_drop, (float) (ps.ps_recv+ps.ps_drop) ));
-+                        CalcPct( (float) ps.ps_drop, (float) ps.ps_recv ));
-             }
-             else
-             {
-@@ -931,44 +931,44 @@
- 
-             LogMessage("Breakdown by protocol:                Action Stats:\n");
-             LogMessage("    TCP: %-10ld (%.3f%%)%-*sALERTS: %-10ld\n", 
--                    pc.tcp, CalcPct((float) pc.tcp, recv + drop), 
-+                    pc.tcp, CalcPct((float) pc.tcp, recv), 
-                     CalcPct((float)pc.tcp,recv + drop)<10?10:9 , " ", pc.alert_pkts);
-             LogMessage("    UDP: %-10ld (%.3f%%)%-*sLOGGED: %-10ld\n", 
--                    pc.udp, CalcPct((float) pc.udp, recv + drop),  
-+                    pc.udp, CalcPct((float) pc.udp, recv),  
-                     CalcPct((float)pc.udp,recv + drop)<10?10:9, " ", pc.log_pkts);
-             LogMessage("   ICMP: %-10ld (%.3f%%)%-*sPASSED: %-10ld\n", 
--                    pc.icmp, CalcPct((float) pc.icmp, recv + drop), 
-+                    pc.icmp, CalcPct((float) pc.icmp, recv), 
-                     CalcPct((float)pc.icmp,recv + drop)<10?10:9, " ", pc.pass_pkts);
-             LogMessage("    ARP: %-10ld (%.3f%%)\n", 
--                    pc.arp, CalcPct((float) pc.arp, recv + drop));
-+                    pc.arp, CalcPct((float) pc.arp, recv));
-             LogMessage("  EAPOL: %-10ld (%.3f%%)\n", 
--                        pc.eapol, CalcPct((float) pc.eapol, recv + drop));
-+                        pc.eapol, CalcPct((float) pc.eapol, recv));
-             LogMessage("   IPv6: %-10ld (%.3f%%)\n", 
--                    pc.ipv6, CalcPct((float) pc.ipv6, recv + drop));
-+                    pc.ipv6, CalcPct((float) pc.ipv6, recv));
-             LogMessage("    IPX: %-10ld (%.3f%%)\n", 
--                    pc.ipx, CalcPct((float) pc.ipx, recv + drop));
-+                    pc.ipx, CalcPct((float) pc.ipx, recv));
-             LogMessage("  OTHER: %-10ld (%.3f%%)\n", 
--                    pc.other, CalcPct((float) pc.other, recv + drop));
-+                    pc.other, CalcPct((float) pc.other, recv));
-             LogMessage("DISCARD: %-10ld (%.3f%%)\n", 
--                    pc.discards, CalcPct((float) pc.discards, recv + drop));
-+                    pc.discards, CalcPct((float) pc.discards, recv));
-             LogMessage("================================================"
-                     "===============================\n");
-             LogMessage("Wireless Stats:\n");
-         LogMessage("Breakdown by type:\n");
-             LogMessage("    Management Packets: %-10ld (%.3f%%)\n", 
-                         pc.wifi_mgmt, CalcPct((float) pc.wifi_mgmt
--                          , recv + drop));
-+                          , recv));
-             LogMessage("    Control Packets:    %-10ld (%.3f%%)\n", 
-                         pc.wifi_control, CalcPct((float) pc.wifi_control
--                          , recv + drop));
-+                          , recv));
-             LogMessage("    Data Packets:       %-10ld (%.3f%%)\n", 
-                         pc.wifi_data, CalcPct((float) pc.wifi_data
--                          , recv + drop));
-+                          , recv));
-             LogMessage("================================================"
-                        "===============================\n");
-             LogMessage("Fragmentation Stats:\n");
-             LogMessage("Fragmented IP Packets: %-10ld (%.3f%%)\n", 
--                    pc.frags, CalcPct((float) pc.frags, recv + drop));
-+                    pc.frags, CalcPct((float) pc.frags, recv));
-             LogMessage("    Fragment Trackers: %-10ld\n", 
-                     pc.frag_trackers);
-             LogMessage("   Rebuilt IP Packets: %-10ld\n", 
-@@ -987,7 +987,7 @@
-             LogMessage("TCP Stream Reassembly Stats:\n");
-             LogMessage("        TCP Packets Used: %-10ld (%-3.3f%%)\n", 
-                     pc.tcp_stream_pkts, 
--                    CalcPct((float) pc.tcp_stream_pkts, recv + drop));
-+                    CalcPct((float) pc.tcp_stream_pkts, recv));
-             LogMessage("         Stream Trackers: %-10ld\n", pc.tcp_streams);
-             LogMessage("          Stream flushes: %-10ld\n", pc.rebuilt_tcp);
-             LogMessage("           Segments used: %-10ld\n", pc.rebuilt_segs);
-
-
diff --git a/net-analyzer/snort/snort-2.0.6.ebuild b/net-analyzer/snort/snort-2.0.6.ebuild
deleted file mode 100644
index 94f35f618f46..000000000000
--- a/net-analyzer/snort/snort-2.0.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.6.ebuild,v 1.10 2005/01/29 05:12:51 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz
-	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.2.5.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
-IUSE="ssl postgres mysql prelude flexresp samba"
-# snort 2.0.x does not support snmp yet Bug #26310
-# IUSE="${IUSE} snmp"
-
-DEPEND="virtual/libc
-	virtual/libpcap
-	flexresp? (	<net-libs/libnet-1.1
-				>=net-libs/libnet-1.0.2a-r3 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.8 )"
-#	snmp? ( >=net-analyzer/net-snmp-5.0 )
-RDEPEND="virtual/libc
-	dev-lang/perl
-	virtual/libpcap
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	samba? ( net-fs/samba )
-	prelude? ( >=dev-libs/libprelude-0.8 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	#is this needed in 2.0? -Method
-	#epatch ${FILESDIR}/${P}-configure.patch
-	use flexresp && epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-
-	epatch ${FILESDIR}/${P}-gcc3.patch
-
-	epatch ${FILESDIR}/snort-drop-calculation.diff
-
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
-
-	use prelude && (
-		epatch ../${P/.6/.2}-prelude.diff
-		sh ./autogen.sh
-	)
-}
-
-src_compile() {
-	local myconf
-	use flexresp && myconf="$myconf --enable-flexresp" # There is no --diable-flexresp, can't use use_enable
-	use samba && myconf="$myconf --enable-smbalerts" # There is no --diable-smbalerts, can't use use_enable
-
-#		`use_with snmp` \
-#		 --enable-pthreads \ # Not supported, never was, and now also removed
-
-	econf \
-		`use_with postgres postgresql` \
-		`use_with mysql` \
-		`use_with ssl openssl` \
-		`use_with prelude` \
-		--without-odbc \
-		--without-oracle \
-		$myconf || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /var/log/snort
-	keepdir /var/log/snort/
-
-	insinto /usr/lib/snort/bin
-	doins contrib/{create_mysql,snortlog,*.pl}
-
-	dodoc COPYING LICENSE doc/*
-	docinto contrib ; dodoc contrib/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map
-	use prelude && doins etc/prelude-classification.config
-	doins etc/snort.conf.distrib
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
-	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
-}
-
-pkg_postinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-
-	chown snort:snort /var/log/snort
-	chmod 0770 /var/log/snort
-}
diff --git a/net-analyzer/snort/snort-2.1.3.ebuild b/net-analyzer/snort/snort-2.1.3.ebuild
deleted file mode 100644
index b8d923da1f1c..000000000000
--- a/net-analyzer/snort/snort-2.1.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.3.ebuild,v 1.12 2005/07/09 18:37:22 swegener Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz
-	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )"
-#	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.2.5.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam"
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-# snort 2.1.x does not have prelude patches yet
-# IUSE="${IUSE} prelude"
-# snort 2.1.x has discontinued smb alert output, and no 3rd party have done them yet
-# IUSE="${IUSE} samba"
-# snort 2.0.x does not support snmp yet Bug #26310 (2.1.x doesn't have SNMP either)
-# IUSE="${IUSE} snmp"
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? (	<net-libs/libnet-1.1
-				>=net-libs/libnet-1.0.2a-r3 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-#	prelude? ( >=dev-libs/libprelude-0.8 )
-#	snmp? ( >=net-analyzer/net-snmp-5.0 )
-RDEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	dev-lang/perl
-	virtual/libpcap
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-#	samba? ( net-fs/samba )
-#	prelude? ( >=dev-libs/libprelude-0.8 )
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	gnuconfig_update
-
-	#is this needed in 2.0? -Method
-	#epatch ${FILESDIR}/${P}-configure.patch
-	use flexresp && epatch ${FILESDIR}/2.1.2-libnet-1.0.patch
-
-	epatch ${FILESDIR}/${P}-gcc3.patch
-
-	#epatch ${FILESDIR}/snort-drop-calculation.diff
-
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
-
-	# Prelude patch currently not compatible with 2.1.0
-	#use prelude && (
-	#	epatch ../${P/.1.0/.0.2}-prelude.diff
-	#	sh ./autogen.sh
-	#)
-
-	use snortsam && (
-		cd ..
-		./patchsnort.sh ${S}
-		cd ${S}
-	)
-}
-
-src_compile() {
-	local myconf
-	use flexresp && myconf="$myconf --enable-flexresp" # There is no --diable-flexresp, can't use use_enable
-#	use samba && myconf="$myconf --enable-smbalerts" # There is no --diable-smbalerts, can't use use_enable
-
-#		`use_with snmp` \
-#		 --enable-pthreads \ # Not supported, never was, and now also removed
-#		`use_with prelude` \
-
-	econf \
-		`use_with postgres postgresql` \
-		`use_with mysql` \
-		`use_with ssl openssl` \
-		--without-odbc \
-		--without-oracle \
-		$myconf || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /var/log/snort
-	keepdir /var/log/snort/
-
-	insinto /usr/lib/snort/bin
-	doins contrib/{create_mysql,snortlog,*.pl}
-
-	dodoc COPYING LICENSE doc/*
-	docinto contrib ; dodoc contrib/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
-	#use prelude && doins etc/prelude-classification.config
-	newins etc/snort.conf snort.conf.distrib
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
-	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres
-	then
-		einfo "To use a database as a backend for snort you'll have to"
-		einfo "import the correct tables to the database."
-		einfo "You'll have to setup a database called snort first."
-		einfo
-		use mysql && einfo "  MySQL: zcat /usr/share/doc/${P}/contrib/create_mysql.gz | mysql -p snort"
-		use postgres && einfo "  PostgreSQL: import /usr/share/doc/${P}/contrib/create_postgresql.gz"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.2.0.ebuild b/net-analyzer/snort/snort-2.2.0.ebuild
deleted file mode 100644
index 9ca3e425baea..000000000000
--- a/net-analyzer/snort/snort-2.2.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.2.0.ebuild,v 1.10 2005/07/09 18:37:22 swegener Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz
-	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )"
-#	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.2.5.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam"
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-# snort 2.1.x does not have prelude patches yet
-# IUSE="${IUSE} prelude"
-# snort 2.1.x has discontinued smb alert output, and no 3rd party have done them yet
-# IUSE="${IUSE} samba"
-# snort 2.0.x does not support snmp yet Bug #26310 (2.1.x doesn't have SNMP either)
-# IUSE="${IUSE} snmp"
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? (	<net-libs/libnet-1.1
-				>=net-libs/libnet-1.0.2a-r3 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-#	prelude? ( >=dev-libs/libprelude-0.8 )
-#	snmp? ( >=net-analyzer/net-snmp-5.0 )
-RDEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	dev-lang/perl
-	virtual/libpcap
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-#	samba? ( net-fs/samba )
-#	prelude? ( >=dev-libs/libprelude-0.8 )
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	gnuconfig_update
-
-	#is this needed in 2.0? -Method
-	#epatch ${FILESDIR}/${P}-configure.patch
-	use flexresp && epatch ${FILESDIR}/2.1.2-libnet-1.0.patch
-
-	epatch ${FILESDIR}/snort-2.1.3-gcc3.patch
-
-	#epatch ${FILESDIR}/snort-drop-calculation.diff
-
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
-
-	# Prelude patch currently not compatible with 2.1.0
-	#use prelude && (
-	#	epatch ../${P/.1.0/.0.2}-prelude.diff
-	#	sh ./autogen.sh
-	#)
-
-	use snortsam && (
-		cd ..
-		./patchsnort.sh ${S}
-		cd ${S}
-	)
-}
-
-src_compile() {
-	local myconf
-	use flexresp && myconf="$myconf --enable-flexresp" # There is no --diable-flexresp, can't use use_enable
-#	use samba && myconf="$myconf --enable-smbalerts" # There is no --diable-smbalerts, can't use use_enable
-
-#		`use_with snmp` \
-#		 --enable-pthreads \ # Not supported, never was, and now also removed
-#		`use_with prelude` \
-
-	econf \
-		`use_with postgres postgresql` \
-		`use_with mysql` \
-		`use_with ssl openssl` \
-		--without-odbc \
-		--without-oracle \
-		$myconf || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /var/log/snort
-	keepdir /var/log/snort/
-
-	insinto /usr/lib/snort/bin
-	doins contrib/{create_mysql,snortlog,*.pl}
-
-	dodoc COPYING LICENSE doc/*
-	docinto contrib ; dodoc contrib/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
-	#use prelude && doins etc/prelude-classification.config
-	newins etc/snort.conf snort.conf.distrib
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
-	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres
-	then
-		einfo "To use a database as a backend for snort you'll have to"
-		einfo "import the correct tables to the database."
-		einfo "You'll have to setup a database called snort first."
-		einfo
-		use mysql && einfo "  MySQL: zcat /usr/share/doc/${P}/contrib/create_mysql.gz | mysql -p snort"
-		use postgres && einfo "  PostgreSQL: import /usr/share/doc/${P}/contrib/create_postgresql.gz"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.3.0.ebuild b/net-analyzer/snort/snort-2.3.0.ebuild
deleted file mode 100644
index 9c676e78f02e..000000000000
--- a/net-analyzer/snort/snort-2.3.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0.ebuild,v 1.5 2005/07/09 18:37:22 swegener Exp $
-
-inherit eutils gnuconfig flag-o-matic
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
-	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.3.6.tar.gz )"
-
-#	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )
-# Gentoo mirrored because of naming conflict with previous version
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline"
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.8 )
-	odbc? ( dev-db/unixODBC )
-	inline? (
-				~net-libs/libnet-1.0.2a
-				net-firewall/iptables
-			)"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-
-	if use flexresp || use inline
-	then
-		epatch ${FILESDIR}/${PV}-libnet-1.0.patch || die "libnet patch failed"
-	fi
-
-	einfo "Patching /etc/snort.conf"
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
-		etc/snort.conf || die "sed snort.conf failed"
-
-	if use prelude
-	then
-		epatch ../snort-2.2.0-prelude-0.3.6.diff || die "prelude patch failed"
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed configure.in failed"
-	fi
-
-	# need to pick up prelude and or flexresp patches
-	einfo "Regenerating autoconf/automake files"
-	autoreconf -f -i || die "autoreconf failed"
-
-	if use snortsam
-	then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# There is no --diable-flexresp, cannot use use_enable
-	use flexresp && myconf="${myconf} --enable-flexresp"
-
-	use inline && append-flags -I/usr/include/libipq
-
-	econf \
-		`use_with postgres postgresql` \
-		`use_with mysql` \
-		`use_with ssl openssl` \
-		`use_with odbc` \
-		--without-oracle \
-		`use_with prelude` \
-		`use_enable inline` \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-
-	dodoc COPYING LICENSE doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules \
-		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf.distrib
-
-	use prelude && doins etc/prelude-classification.config
-
-	newinitd ${FILESDIR}/snort.rc6 snort
-	newconfd ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use odbc
-	then
-		einfo "To use a database as a backend for snort you will have to"
-		einfo "import the correct tables to the database."
-		einfo "You will have to setup a database called snort first."
-		einfo
-		use mysql && \
-			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
-		use postgres && \
-			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
-		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.3.0_rc2.ebuild b/net-analyzer/snort/snort-2.3.0_rc2.ebuild
deleted file mode 100644
index 8247e13a17ab..000000000000
--- a/net-analyzer/snort/snort-2.3.0_rc2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0_rc2.ebuild,v 1.10 2005/07/09 18:37:22 swegener Exp $
-
-inherit eutils gnuconfig
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${MY_P}.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
-	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.3.6.tar.gz )"
-
-#	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )
-# Gentoo mirrored because of naming conflict with previous version
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude"
-
-S=${WORKDIR}/${MY_P}
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.8 )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-
-	if use flexresp
-	then
-		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch || die "libnet patch failed"
-	fi
-
-	einfo "Patching /etc/snort.conf"
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
-
-	if use prelude
-	then
-		epatch ../snort-2.2.0-prelude-0.3.6.diff || die "prelude patch failed"
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-	fi
-	# need to pick up prelude and or flexresp patches
-	einfo "Regenerating autoconf/automake files"
-	autoreconf -f -i || die "autoreconf failed"
-
-	if use snortsam
-	then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# There is no --diable-flexresp, cannot use use_enable
-	use flexresp && myconf="${myconf} --enable-flexresp"
-
-	econf \
-		`use_with postgres postgresql` \
-		`use_with mysql` \
-		`use_with ssl openssl` \
-		`use_with odbc` \
-		--without-oracle \
-		`use_with prelude` \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	keepdir /var/log/snort/
-
-	dodoc COPYING LICENSE doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf.distrib
-
-	use prelude && doins etc/prelude-classification.config
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
-	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use odbc
-	then
-		einfo "To use a database as a backend for snort you will have to"
-		einfo "import the correct tables to the database."
-		einfo "You will have to setup a database called snort first."
-		einfo
-		use mysql && \
-			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
-		use postgres && \
-			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
-		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.4.20050508.ebuild b/net-analyzer/snort/snort-2.4.0.ebuild
index 1bd0579a40f4..706a41988268 100644
--- a/net-analyzer/snort/snort-2.4.20050508.ebuild
+++ b/net-analyzer/snort/snort-2.4.0.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.20050508.ebuild,v 1.3 2005/07/09 18:37:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.0.ebuild,v 1.1 2005/07/29 04:06:17 vanquirius Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
-# Note: This is a experimental CVS build
-
 DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
-	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
+SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
+	http://dev.gentoo.org/~vanquirius/files/snort-2.4.0-genpatches.tar.bz2
+	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )"
+	# mirror://gentoo/snort-2.4.0-genpatches.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,25 +26,30 @@ DEPEND="virtual/libc
 	prelude? ( >=dev-libs/libprelude-0.9.0_rc1 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
-				~net-libs/libnet-1.0.2a
-				net-firewall/iptables
-			)"
+		~net-libs/libnet-1.0.2a
+		net-firewall/iptables
+		)"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	selinux? ( sec-policy/selinux-snort )
 	snortsam? ( net-analyzer/snortsam )"
 
+pkg_setup() {
+	enewgroup snort
+	enewuser snort -1 /bin/false /dev/null snort
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	gnuconfig_update
 
 	if use flexresp || use inline ; then
-		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+		epatch ${WORKDIR}/2.4.0-libnet-1.0.patch
 	fi
 
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
 		etc/snort.conf || die "sed snort.conf failed"
 
 	if use prelude ; then
@@ -54,10 +58,8 @@ src_unpack() {
 	fi
 
 	if use sguil ; then
-		cd ${S}/src/preprocessors
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
-		cd ${S}
+		epatch ${WORKDIR}/2.4.0-spp_portscan_sguil.patch || die
+		epatch ${WORKDIR}/2.4.0-spp_stream4_sguil.patch || die
 	fi
 
 	if use snortsam ; then
@@ -93,15 +95,6 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
@@ -111,17 +104,20 @@ src_install() {
 	docinto schemas ; dodoc schemas/*
 
 	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules \
+	doins etc/reference.config etc/classification.config \
 		etc/*.map etc/threshold.conf
 	newins etc/snort.conf snort.conf.distrib
 
-	use prelude && doins etc/prelude-classification.config
+	# use prelude && doins etc/prelude-classification.config
 
 	newinitd ${FILESDIR}/snort.rc6 snort
 	newconfd ${FILESDIR}/snort.confd snort
 
 	chown snort:snort ${D}/var/log/snort
 	chmod 0770 ${D}/var/log/snort
+
+	# create directory to store rules in
+	dodir ${D}/etc/snort/rules
 }
 
 pkg_postinst() {
@@ -139,4 +135,7 @@ pkg_postinst() {
 		einfo "Also, read the following Gentoo forums article:"
 		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
 	fi
+	ewarn "Rules are no longer included with snort."
+	ewarn "Please add your rules to /etc/snort/rules."
+	ewarn "For more information, visit ${HOMEPAGE}."
 }