Drop old versions and associated files, add 2.9.2.1, and tweak SRC_URI to use a download URL specified on the Snort website that doesn't require manual updating for each new release.

(Portage version: 2.1.10.45/cvs/Linux x86_64)

14 files changed, 24 insertions, 1929 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index d380a1bf233e..223ccbf5bea5 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.189 2012/03/11 03:46:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.190 2012/03/11 14:01:46 kumba Exp $
+
+*snort-2.9.2.1 (11 Mar 2012)
+
+  11 Mar 2012; Joshua Kinard <kumba@gentoo.org>
+  -files/snort-2.8.4-libnet.patch, -snort-2.8.5.1.ebuild,
+  -snort-2.8.5.3.ebuild, -snort-2.8.6.ebuild, -snort-2.8.6.1.ebuild,
+  -snort-2.9.0.4-r1.ebuild, snort-2.9.0.5.ebuild, snort-2.9.1.ebuild,
+  -snort-2.9.2.ebuild, +snort-2.9.2.1.ebuild, -files/pcap_memory.patch,
+  -files/snort.rc9, -files/snort.reload.rc1, metadata.xml:
+  Drop old versions and associated files, add 2.9.2.1, and tweak SRC_URI to use
+  a download URL specified on the Snort website that doesn't require manual
+  updating for each new release.
 
   11 Mar 2012; Tim Harder <radhermit@gentoo.org> snort-2.9.2.ebuild:
   Fix multilib issue (bug #403725, patch by Rick Farina).
diff --git a/net-analyzer/snort/files/pcap_memory.patch b/net-analyzer/snort/files/pcap_memory.patch
deleted file mode 100644
index 0f75e34dc60d..000000000000
--- a/net-analyzer/snort/files/pcap_memory.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru snort-2.8.4.orig/src/snort.c snort-2.8.4/src/snort.c
---- snort-2.8.4.orig/src/snort.c	2009-01-28 11:37:03.000000000 -0500
-+++ snort-2.8.4/src/snort.c	2009-04-09 10:48:26.000000000 -0400
-@@ -1188,6 +1188,15 @@
-         LogMessage("Not Using PCAP_FRAMES\n" );
-     }
- 
-+    if( getenv("PCAP_MEMORY") )
-+    {
-+        LogMessage("Using PCAP_MEMORY = %s\n", getenv("PCAP_MEMORY") );
-+    }
-+    else
-+    {
-+        LogMessage("Not Using PCAP_MEMORY\n" );
-+    }
-+
- #ifdef TIMESTATS
-     start_time = time(&start_time); /* start counting seconds */
- #endif
diff --git a/net-analyzer/snort/files/snort-2.8.4-libnet.patch b/net-analyzer/snort/files/snort-2.8.4-libnet.patch
deleted file mode 100644
index b0f073a14d51..000000000000
--- a/net-analyzer/snort/files/snort-2.8.4-libnet.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -ru snort-2.8.4.rc1/configure.in snort-2.8.4.rc1_gentoo/configure.in
---- snort-2.8.4.rc1/configure.in	2009-04-06 08:54:54.000000000 -0400
-+++ snort-2.8.4.rc1_gentoo/configure.in	2009-04-06 09:08:37.000000000 -0400
-@@ -1214,19 +1214,19 @@
-          else
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
--        AC_MSG_CHECKING("for libnet.h version 1.0.x")
-+        AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
-         for i in $libnet_dir; do
--            if test -r "$i/libnet.h"; then
-+            if test -r "$i/libnet-1.0.h"; then
-                 LIBNET_INC_DIR="$i"
-             fi
-         done
- 
-         if test "$LIBNET_INC_DIR" != ""; then
--            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then
--                FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)
-+            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0 >/dev/null"; then
-+                FAIL_MESSAGE("libnet 1.0.x (libnet-1.0.h)", $LIBNET_INC_DIR)
-             fi
--            CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
--            LIBS="${LIBS} `libnet-config --libs`"
-+            CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`"
-+            LIBS="${LIBS} `libnet-1.0-config --libs`"
-             CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
-             AC_MSG_RESULT($i)
-         else
-@@ -1248,8 +1248,8 @@
- [  --enable-flexresp        Flexible Responses on hostile connection attempts],
-        enable_flexresp="$enableval", enable_flexresp="no")
- if test "x$enable_flexresp" = "xyes"; then
--    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`"
- fi
-                 
- if test "x$enable_flexresp" != "xno" -a "x$enable_flexresp" = "xyes"; then
-@@ -1259,21 +1259,21 @@
-         exit
-     fi
- 
--    if test `libnet-config --cflags | wc -c` = "1"; then
-+    if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-         CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-         LIBNET_CONFIG_BROKEN_CFLAGS="yes"
-     fi
- 
--    if test `libnet-config --libs | wc -c` = "1"; then
--        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+    if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+        AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-         AC_MSG_WARN(are using a precompiled package please notify the) 
-         AC_MSG_WARN(maintainer.)
-         LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
--        LIBS="${LIBS} -lnet"
-+        LIBS="${LIBS} -lnet-1.0"
-     fi
- 
-     LNET=""
--    AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+    AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet header not found, go get it from"
-@@ -1291,33 +1291,33 @@
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
-     else
--        libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+        libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-     fi
- 
-     LIBNET_INC_DIR=""
-     for i in $libnet_dir; do
--        if test -r "$i/libnet.h"; then
-+        if test -r "$i/libnet-1.0.h"; then
-             LIBNET_INC_DIR="$i"
-         fi
-     done
- 
-     if test "x$LIBNET_INC_DIR" != "x"; then
--        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
-             AC_MSG_RESULT(no)
-             echo
-             echo "   ERROR!  Snort with --enable-flexresp will *only* work with"
-             echo "   libnet version 1.0.2a, go get it from"
-             echo "   http://www.packetfactory.net/projects/libnet/"
--            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+            FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-         fi
-         AC_MSG_RESULT(yes)
-     else
-         AC_MSG_RESULT(no)
--        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+        FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-     fi
- 
-     LNET=""
--    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+    AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet library not found, go get it from"
-@@ -1368,8 +1368,8 @@
- [  --enable-react           Intercept and terminate offending HTTP accesses],
-        enable_react="$enableval", enable_react="no")
- if test "x$enable_react" = "xyes"; then
--    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`"
--    LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`"
-+    LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
- fi
- 
- if test "x$enable_react" != "xno" -a "x$enable_react" = "xyes"; then
-@@ -1380,13 +1380,13 @@
-         exit
-     fi
- 
--    if test `libnet-config --cflags | wc -c` = "1"; then
-+    if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-         CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-         LIBNET_CONFIG_BROKEN_CFLAGS="yes"
-     fi
- 
--    if test `libnet-config --libs | wc -c` = "1"; then
--        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+    if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+        AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-         AC_MSG_WARN(are using a precompiled package please notify the)
-         AC_MSG_WARN(maintainer.)
-         LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
-@@ -1394,7 +1394,7 @@
-     fi
- 
-     LNET=""
--    AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+    AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet header not found, go get it from"
-@@ -1412,33 +1412,33 @@
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
-     else
--        libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+        libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-     fi
- 
-     LIBNET_INC_DIR=""
-     for i in $libnet_dir; do
--        if test -r "$i/libnet.h"; then
-+        if test -r "$i/libnet-1.0.h"; then
-             LIBNET_INC_DIR="$i"
-         fi
-     done
- 
-     if test "x$LIBNET_INC_DIR" != "x"; then
--        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
-             AC_MSG_RESULT(no)
-             echo
-             echo "   ERROR!  Snort with --enable-react will *only* work with"
-             echo "   libnet version 1.0.2a, go get it from"
-             echo "   http://www.packetfactory.net/projects/libnet/"
--            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+            FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-         fi
-         AC_MSG_RESULT(yes)
-     else
-         AC_MSG_RESULT(no)
--        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+        FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-     fi
- 
-     LNET=""
--    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+    AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet library not found, go get it from"
-Only in snort-2.8.4.rc1_gentoo/: configure.in.orig
-diff -ru snort-2.8.4.rc1/src/detection-plugins/sp_react.c snort-2.8.4.rc1_gentoo/src/detection-plugins/sp_react.c
---- snort-2.8.4.rc1/src/detection-plugins/sp_react.c	2009-04-06 08:54:54.000000000 -0400
-+++ snort-2.8.4.rc1_gentoo/src/detection-plugins/sp_react.c	2009-04-06 09:08:37.000000000 -0400
-@@ -59,7 +59,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "rules.h"
- #include "decode.h"
-diff -ru snort-2.8.4.rc1/src/detection-plugins/sp_respond.c snort-2.8.4.rc1_gentoo/src/detection-plugins/sp_respond.c
---- snort-2.8.4.rc1/src/detection-plugins/sp_respond.c	2009-04-06 08:54:54.000000000 -0400
-+++ snort-2.8.4.rc1_gentoo/src/detection-plugins/sp_respond.c	2009-04-06 09:08:37.000000000 -0400
-@@ -36,7 +36,7 @@
- 
- 
- #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "rules.h"
-diff -ru snort-2.8.4.rc1/src/inline.c snort-2.8.4.rc1_gentoo/src/inline.c
---- snort-2.8.4.rc1/src/inline.c	2009-04-06 08:54:54.000000000 -0400
-+++ snort-2.8.4.rc1_gentoo/src/inline.c	2009-04-06 09:08:37.000000000 -0400
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <pcap.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "inline.h"
diff --git a/net-analyzer/snort/files/snort.rc9 b/net-analyzer/snort/files/snort.rc9
deleted file mode 100644
index 6c65a353adc8..000000000000
--- a/net-analyzer/snort/files/snort.rc9
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc9,v 1.3 2009/04/17 12:05:29 patrick Exp $
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run snort"
-		eerror "There is an example config in /etc/snort/snort.conf.distrib"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting snort"
-	start-stop-daemon --start --quiet --exec /usr/bin/snort \
-		-- --nolock-pidfile --pid-path ${PIDPATH} ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDPATH}/${PIDFILE}
-	# Snort needs a few seconds to fully shutdown
-	sleep 15
-	eend $?
-}
diff --git a/net-analyzer/snort/files/snort.reload.rc1 b/net-analyzer/snort/files/snort.reload.rc1
deleted file mode 100644
index b06d2d580a6b..000000000000
--- a/net-analyzer/snort/files/snort.reload.rc1
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.reload.rc1,v 1.1 2009/11/02 17:24:38 patrick Exp $
-
-opts="checkconfig reload"
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run snort"
-		eerror "There is an example config in /etc/snort/snort.conf.distrib"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting snort"
-	start-stop-daemon --start --quiet --exec /usr/bin/snort \
-		-- --nolock-pidfile --pid-path ${PIDPATH} ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDPATH}/${PIDFILE}
-	# Snort needs a few seconds to fully shutdown
-	sleep 15
-	eend $?
-}
-
-reload() {
-        if [ ! -f ${PIDPATH}/${PIDFILE} ]; then
-        	eerror "Snort isn't running"
-                return 1
-        fi
-
-        checkconfig || return 1
-        ebegin "Reloading Snort"
-        start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDPATH}/${PIDFILE}
-        eend $?
-}
-
-
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 9e977f34dd21..5d1fe3717dcf 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -43,24 +43,11 @@
 			and rules library. This is required if you want to use shared 

 			object (SO) snort rules.

 		</flag>

-		<flag name='flexresp'>

-			(DEPRECIATED) Original method for enabling connection tearing for 

-			inline deployments. Replaced with flexresp3 in Snort-2.9.0.

-		</flag>

-		<flag name='flexresp2'>

-			(DEPRECIATED) Replaced flexresp for enabling connection tearing for

-			inline deployments. Replaced with flexresp3 in Snort-2.9.0.

-		</flag>

 		<flag name='gre'>

 			Enable support for inspecting and processing Generic Routing 

 			Encapsulation (GRE) packet headders. Only needed if you are

 			monitoring GRE tunnels.

 		</flag>

-		<flag name='inline'>

-			(DEPRECIATED) Enables support for deploying snort inline. Uses

-			<pkg>net-firewall/iptables</pkg>, via libipq, rather than

-			<pkg>net-libs/libpcap</pkg>. Replaced by DAQ in Snort-2.9.0

-		</flag>

 		<flag name='inline-init-failopen'>

 			Enables support to allow traffic to pass (fail-open) through

 			inline deployments while snort is starting and not ready to begin

@@ -97,14 +84,6 @@
 			for all hosts on the monitored network. This is cumbersome, but

 			can improve intrusion detection accuracy.

 		</flag>

-		<flag name='timestats'>

-			(DEPRECIATED) Enables support for printing packet stats on a per

-			hour and per protocol breakdown. Depreciated in Snort-2.9.0.

-		</flag>

-		<flag name='reload'>

-			Enables support for reloading a configuration without restarting

-			snort.

-		</flag>

 		<flag name='reload-error-restart'>

 			Enables support for completely restarting snort if an error is 

 			detected durring a reload.

diff --git a/net-analyzer/snort/snort-2.8.5.1.ebuild b/net-analyzer/snort/snort-2.8.5.1.ebuild
deleted file mode 100644
index 3cd08272faad..000000000000
--- a/net-analyzer/snort/snort-2.8.5.1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.5.1.ebuild,v 1.10 2011/04/02 12:52:27 ssuominen Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql odbc postgres selinux"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="net-libs/libpcap
-	>=dev-libs/libpcre-6.0
-	flexresp2? ( dev-libs/libdnet )
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	react? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use flexresp && use flexresp2; then
-		eerror
-		eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-		eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-		eerror "flexresp2 is recommended."
-		die
-	elif use flexresp && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp' USE flags set."
-		eerror "'react' is enabled automaticly when the 'flexresp'"
-		eerror "USE flag is set, but ./configure will fail if both are enabled."
-		eerror
-		eerror "This is an upstream issue and not a problem with this ebuild."
-		eerror
-		eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-		die
-	elif use flexresp2 && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp2' USE flags set."
-		eerror "You can use 'react' OR 'flexresp2' but not both."
-		die
-	elif use inline-init-failopen && ! use inline; then
-		eerror
-		eerror "You have enabled the 'inline-init-failopen' USE flag"
-		eerror "but not the 'inline' USE flag."
-		eerror "'inline-init-failopen' requires 'inline' be enabled."
-		die
-	elif use ipv6 && use prelude; then
-		eerror
-		eerror "You have both the 'prelude' and 'ipv6' USE flags set."
-		eerror "The Prelude output plugin does not currently support IPv6."
-		die
-	elif use reload-error-restart && ! use reload; then
-		eerror
-		eerror "You have enabled the 'reload-error-restart' USE flag"
-		eerror "but not the 'reload' USE flag."
-		eerror "'reload-error-restart' requires 'reload' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to allow parallel building.
-	# Thanks to Natanael Copa #291558
-	einfo "Applying parallel building fix."
-	sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-	                src/dynamic-preprocessors/*/Makefile.am \
-					|| die "parallel builds fix Failed"
-
-	#Replaces the libnet-1.0 patch for inline, flexresp, and react
-	if use flexresp || use react || use inline; then
-
-		einfo "Applying libnet-1.0 fix."
-		sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-			"${WORKDIR}/${P}/configure.in" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-			"${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-		sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-		sed -i -e 's:-lnet:-lnet-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-		sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-	fi
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	#This sed will prevent the example dynamic code from being compiled/installed
-	einfo "Disabling sample code."
-	sed -i -e 's:$(EXAMPLES_DIR)::g' "${WORKDIR}/${P}/src/Makefile.am"
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-
-	local myconf
-
-	#targetbased and inline-init-failopen automaticly enable pthread
-	if use threads || use targetbased || use inline-init-failopen; then
-		myconf="${myconf} --enable-pthread"
-	fi
-
-	#Tell flexresp, react, and inline where libipq is
-	if use flexresp || use react || use inline; then
-		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-	fi
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable timestats) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable debug) \
-		$(use_enable reload) \
-		$(use_enable reload-error-restart) \
-		$(use_enable flexresp) \
-		$(use_enable flexresp2) \
-		$(use_enable react) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-ipfw \
-		--disable-profile \
-		--disable-ppm-test \
-		--without-oracle \
-		${myconf}
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-	fowners snort:snort /var/log/snort
-
-	keepdir /var/run/snort/
-	fowners snort:snort /var/run/snort/
-
-	dodoc doc/*
-	dodoc ./RELEASE.NOTES
-	docinto schemas
-	dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/sid-msg.map \
-		etc/threshold.conf \
-		etc/unicode.map \
-		|| die "Failed to add files in /etc/snort"
-
-	newins etc/snort.conf snort.conf.distrib
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		|| die "Failed to add files in /etc/snort/preproc_rules"
-
-	keepdir /etc/snort/rules/
-
-	keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-	fowners -R snort:snort /etc/snort/
-
-	if use reload; then
-		newinitd "${FILESDIR}/snort.reload.rc1" snort \
-			|| die "Failed to add snort.reload.rc1"
-	else
-		newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-	fi
-
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:snort_dynamicrule/$:snort_dynamicrule:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Disable all rule files by default.
-	#Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Snort is a libpcap based packet capture tool which can be used in"
-	einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-	einfo "Detection/Prevention System Mode."
-	einfo
-	einfo "To learn more about these modes review the Snort User Manual at..."
-	einfo
-	einfo "http://www.snort.org/docs/"
-	einfo
-	einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	einfo "information on configuring snort."
-	einfo
-	einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-	einfo "recommended for all users..."
-	einfo
-	einfo "http://www.snort.org/community/mailing-lists/"
-	einfo
-	einfo "To download rules for use with Snort please, see the following"
-	einfo
-	einfo "Sourcefire's VRT Rules and older Community Rules:"
-	einfo "http://www.snort.org/pub-bin/downloads.cgi"
-	einfo
-	einfo "Emerging Threats Rules:"
-	einfo "http://www.emergingthreats.net/"
-	einfo
-	einfo "To manage updates to your rules please visit..."
-	einfo
-	einfo "http://oinkmaster.sourceforge.net/"
-	einfo
-	einfo "and then 'emerge oinkmaster'."
-	elog
-	elog "Snort-2.8.5.1 Notes:"
-	elog
-	elog "Ebuild Notes"
-	elog "The 'memory-cleanup' USE flag has been removed."
-	elog "Snort will now always clean memory now at exit."
-	elog
-	elog "Snort Release Notes:"
-	elog "http://dl.snort.org/snort-current/release_notes_285.txt"
-	elog "http://dl.snort.org/snort-current/release_notes_2851.txt"
-	elog
-	elog "Make sure to check snort.conf.distrib for new features/options."
-	elog
-}
diff --git a/net-analyzer/snort/snort-2.8.5.3.ebuild b/net-analyzer/snort/snort-2.8.5.3.ebuild
deleted file mode 100644
index 2a106693d298..000000000000
--- a/net-analyzer/snort/snort-2.8.5.3.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.5.3.ebuild,v 1.5 2011/04/02 12:52:27 ssuominen Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-#SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
-SRC_URI="http://download.openpkg.org/components/cache/snort/snort-2.8.5.3.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql odbc postgres selinux"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="net-libs/libpcap
-	>=dev-libs/libpcre-6.0
-	flexresp2? ( dev-libs/libdnet )
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	react? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use flexresp && use flexresp2; then
-		eerror
-		eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-		eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-		eerror "flexresp2 is recommended."
-		die
-	elif use flexresp && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp' USE flags set."
-		eerror "'react' is enabled automaticly when the 'flexresp'"
-		eerror "USE flag is set, but ./configure will fail if both are enabled."
-		eerror
-		eerror "This is an upstream issue and not a problem with this ebuild."
-		eerror
-		eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-		die
-	elif use flexresp2 && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp2' USE flags set."
-		eerror "You can use 'react' OR 'flexresp2' but not both."
-		die
-	elif use inline-init-failopen && ! use inline; then
-		eerror
-		eerror "You have enabled the 'inline-init-failopen' USE flag"
-		eerror "but not the 'inline' USE flag."
-		eerror "'inline-init-failopen' requires 'inline' be enabled."
-		die
-	elif use reload-error-restart && ! use reload; then
-		eerror
-		eerror "You have enabled the 'reload-error-restart' USE flag"
-		eerror "but not the 'reload' USE flag."
-		eerror "'reload-error-restart' requires 'reload' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to prevent the docs Makefile from being used.
-	# Fixes #297190.
-	einfo "Applying documentation fix."
-	sed -i -e 's:src doc etc:src etc:g' \
-		"${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
-
-	# Fix to allow parallel building.
-	# Thanks to Natanael Copa #291558
-	einfo "Applying parallel building fix."
-	sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-	                src/dynamic-preprocessors/*/Makefile.am \
-					|| die "parallel builds fix Failed"
-
-	#Replaces the libnet-1.0 patch for inline, flexresp, and react
-	if use flexresp || use react || use inline; then
-
-		einfo "Applying libnet-1.0 fix."
-		sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-			"${WORKDIR}/${P}/configure.in" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-			"${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-		sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-		sed -i -e 's:-lnet:-lnet-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-		sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-	fi
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	#This sed will prevent the example dynamic code from being compiled/installed
-	einfo "Disabling sample code."
-	sed -i -e 's:$(EXAMPLES_DIR)::g' "${WORKDIR}/${P}/src/Makefile.am"
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-
-	local myconf
-
-	#targetbased and inline-init-failopen automaticly enable pthread
-	if use threads || use targetbased || use inline-init-failopen; then
-		myconf="${myconf} --enable-pthread"
-	fi
-
-	#Tell flexresp, react, and inline where libipq is
-	if use flexresp || use react || use inline; then
-		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-	fi
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable timestats) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable debug) \
-		$(use_enable reload) \
-		$(use_enable reload-error-restart) \
-		$(use_enable flexresp) \
-		$(use_enable flexresp2) \
-		$(use_enable react) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-ipfw \
-		--disable-profile \
-		--disable-ppm-test \
-		--without-oracle \
-		${myconf}
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-	fowners snort:snort /var/log/snort
-
-	keepdir /var/run/snort/
-	fowners snort:snort /var/run/snort/
-
-	dodoc doc/*
-	dodoc ./RELEASE.NOTES
-	docinto schemas
-	dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/sid-msg.map \
-		etc/threshold.conf \
-		etc/unicode.map \
-		|| die "Failed to add files in /etc/snort"
-
-	newins etc/snort.conf snort.conf.distrib
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		|| die "Failed to add files in /etc/snort/preproc_rules"
-
-	keepdir /etc/snort/rules/
-
-	keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-	fowners -R snort:snort /etc/snort/
-
-	if use reload; then
-		newinitd "${FILESDIR}/snort.reload.rc1" snort \
-			|| die "Failed to add snort.reload.rc1"
-	else
-		newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-	fi
-
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:snort_dynamicrule/$:snort_dynamicrule:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Disable all rule files by default.
-	#Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Snort is a libpcap based packet capture tool which can be used in"
-	einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-	einfo "Detection/Prevention System Mode."
-	einfo
-	einfo "To learn more about these modes review the Snort User Manual at..."
-	einfo
-	einfo "http://www.snort.org/docs/"
-	einfo
-	einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	einfo "information on configuring snort."
-	einfo
-	einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-	einfo "recommended for all users..."
-	einfo
-	einfo "http://www.snort.org/community/mailing-lists/"
-	einfo
-	einfo "To download rules for use with Snort please, see the following"
-	einfo
-	einfo "Sourcefire's VRT Rules and older Community Rules:"
-	einfo "http://www.snort.org/pub-bin/downloads.cgi"
-	einfo
-	einfo "Emerging Threats Rules:"
-	einfo "http://www.emergingthreats.net/"
-	einfo
-	einfo "To manage updates to your rules please visit..."
-	einfo
-	einfo "http://oinkmaster.sourceforge.net/"
-	einfo
-	einfo "and then 'emerge oinkmaster'."
-	elog
-	elog "Snort-2.8.5.3 Notes:"
-	elog
-	elog "Ebuild Notes"
-	elog "The USE flags 'prelude' and 'ipv6' now work when used together."
-	elog
-	elog "Snort Release Notes:"
-	elog "http://dl.snort.org/snort-current/release_notes_2853.txt"
-	elog
-	elog "Make sure to check snort.conf.distrib for new features/options."
-	elog
-}
diff --git a/net-analyzer/snort/snort-2.8.6.1.ebuild b/net-analyzer/snort/snort-2.8.6.1.ebuild
deleted file mode 100644
index 3d9c61b74b7b..000000000000
--- a/net-analyzer/snort/snort-2.8.6.1.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.6.1.ebuild,v 1.2 2011/04/02 12:52:27 ssuominen Exp $
-
-EAPI="2"
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/116 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules
-ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude
-threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql
-odbc postgres selinux zlib"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="net-libs/libpcap
-	>=dev-libs/libpcre-6.0
-	flexresp2? ( dev-libs/libdnet )
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	react? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use flexresp && use flexresp2; then
-		eerror
-		eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-		eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-		eerror "flexresp2 is recommended."
-		eerror
-		eerror
-		die
-	elif use flexresp && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp' USE flags set."
-		eerror "'react' is enabled automaticly when the 'flexresp'"
-		eerror "USE flag is set, but ./configure will fail if both are enabled."
-		eerror
-		eerror "This is an upstream issue and not a problem with this ebuild."
-		eerror
-		eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-		eerror
-		eerror
-		die
-	elif use flexresp2 && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp2' USE flags set."
-		eerror "You can use 'react' OR 'flexresp2' but not both."
-		eerror
-		eerror
-		die
-	elif use inline-init-failopen && ! use inline; then
-		eerror
-		eerror "You have enabled the 'inline-init-failopen' USE flag"
-		eerror "but not the 'inline' USE flag."
-		eerror "'inline-init-failopen' requires 'inline' be enabled."
-		eerror
-		eerror
-		die
-	elif use reload-error-restart && ! use reload; then
-		eerror
-		eerror "You have enabled the 'reload-error-restart' USE flag"
-		eerror "but not the 'reload' USE flag."
-		eerror "'reload-error-restart' requires 'reload' be enabled."
-		eerror
-		eerror
-		die
-	elif use zlib && ! use dynamicplugin; then
-		eerror
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		eerror
-		eerror
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-}
-
-src_prepare() {
-
-	# Fix to prevent the docs Makefile from being used.
-	# Fixes #297190.
-	einfo "Applying documentation fix."
-	sed -i -e 's:src doc etc:src etc:g' \
-		"${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
-
-	#Replaces the libnet-1.0 patch for inline, flexresp, and react
-	if use flexresp || use react || use inline; then
-
-		einfo "Applying libnet-1.0 fix."
-		sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-			"${WORKDIR}/${P}/configure.in" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-			"${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-		sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-		sed -i -e 's:-lnet:-lnet-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-		sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-	fi
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2 sdf; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	local myconf
-
-	#targetbased and inline-init-failopen automaticly enable pthread
-	if use threads || use targetbased || use inline-init-failopen; then
-		myconf="${myconf} --enable-pthread"
-	fi
-
-	#Tell flexresp, react, and inline where libipq is
-	if use flexresp || use react || use inline; then
-		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-	fi
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable timestats) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable debug) \
-		$(use_enable reload) \
-		$(use_enable reload-error-restart) \
-		$(use_enable flexresp) \
-		$(use_enable flexresp2) \
-		$(use_enable react) \
-		$(use_enable aruba) \
-		$(use_enable zlib) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-build-dynamic-examples \
-		--disable-corefiles \
-		--disable-ipfw \
-		--disable-profile \
-		--disable-ppm-test \
-		--without-oracle \
-		${myconf}
-
-}
-
-src_compile() {
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-	fowners snort:snort /var/log/snort
-
-	keepdir /var/run/snort/
-	fowners snort:snort /var/run/snort/
-
-	dodoc doc/*
-	dodoc ./RELEASE.NOTES
-	docinto schemas
-	dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/sid-msg.map \
-		etc/threshold.conf \
-		etc/unicode.map \
-		|| die "Failed to add files in /etc/snort"
-
-	newins etc/snort.conf snort.conf.distrib
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		|| die "Failed to add files in /etc/snort/preproc_rules"
-
-	keepdir /etc/snort/rules/
-
-	keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-	fowners -R snort:snort /etc/snort/
-
-	if use reload; then
-		newinitd "${FILESDIR}/snort.reload.rc1" snort \
-			|| die "Failed to add snort.reload.rc1"
-	else
-		newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-	fi
-
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Disable all rule files by default.
-	#Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Snort is a libpcap based packet capture tool which can be used in"
-	einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-	einfo "Detection/Prevention System Mode."
-	einfo
-	einfo "To learn more about these modes review the Snort User Manual at..."
-	einfo
-	einfo "http://www.snort.org/docs/"
-	einfo
-	einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	einfo "information on configuring snort."
-	einfo
-	einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-	einfo "recommended for all users..."
-	einfo
-	einfo "http://www.snort.org/community/mailing-lists/"
-	einfo
-	einfo "To download rules for use with Snort please, see the following"
-	einfo
-	einfo "Sourcefire's VRT Rules and older Community Rules:"
-	einfo "http://www.snort.org/pub-bin/downloads.cgi"
-	einfo
-	einfo "Emerging Threats Rules:"
-	einfo "http://www.emergingthreats.net/"
-	einfo
-	einfo "To manage updates to your rules please visit..."
-	einfo
-	einfo "http://code.google.com/p/pulledpork/"
-	einfo
-	elog
-	elog "Snort Release Notes:"
-	elog "http://www.snort.org/snort-downloads"
-	elog
-	elog
-	elog "Shared Object (SO) rules and registered (non-subscription) rule users:"
-	elog
-	elog "Please note, you can not use Snort-2.8.6.1 with the SO rules from"
-	elog "the 2.8.6.0 rule tarball. If you do not have a subscription to the VRT ruleset"
-	elog "and you wish to continue using SO rules you will need to downgrade to"
-	elog "Snort-2.8.6. The SO rules will be made available to registered"
-	elog "(non-subscription) rule users on Sept. 22, 2010 (30 days after"
-	elog "being released to subscription users)."
-	elog
-	elog "Please see http://www.snort.org/snort-rules/#rules for more details."
-	elog
-}
diff --git a/net-analyzer/snort/snort-2.8.6.ebuild b/net-analyzer/snort/snort-2.8.6.ebuild
deleted file mode 100644
index 7d78d0087760..000000000000
--- a/net-analyzer/snort/snort-2.8.6.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.6.ebuild,v 1.4 2011/04/02 12:52:27 ssuominen Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules
-ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude
-threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql
-odbc postgres selinux zlib"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="net-libs/libpcap
-	>=dev-libs/libpcre-6.0
-	flexresp2? ( dev-libs/libdnet )
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	react? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use flexresp && use flexresp2; then
-		eerror
-		eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-		eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-		eerror "flexresp2 is recommended."
-		eerror
-		eerror
-		die
-	elif use flexresp && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp' USE flags set."
-		eerror "'react' is enabled automaticly when the 'flexresp'"
-		eerror "USE flag is set, but ./configure will fail if both are enabled."
-		eerror
-		eerror "This is an upstream issue and not a problem with this ebuild."
-		eerror
-		eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-		eerror
-		eerror
-		die
-	elif use flexresp2 && use react; then
-		eerror
-		eerror "You have both the 'react' and 'flexresp2' USE flags set."
-		eerror "You can use 'react' OR 'flexresp2' but not both."
-		eerror
-		eerror
-		die
-	elif use inline-init-failopen && ! use inline; then
-		eerror
-		eerror "You have enabled the 'inline-init-failopen' USE flag"
-		eerror "but not the 'inline' USE flag."
-		eerror "'inline-init-failopen' requires 'inline' be enabled."
-		eerror
-		eerror
-		die
-	elif use reload-error-restart && ! use reload; then
-		eerror
-		eerror "You have enabled the 'reload-error-restart' USE flag"
-		eerror "but not the 'reload' USE flag."
-		eerror "'reload-error-restart' requires 'reload' be enabled."
-		eerror
-		eerror
-		die
-	elif use zlib && ! use dynamicplugin; then
-		eerror
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		eerror
-		eerror
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to prevent the docs Makefile from being used.
-	# Fixes #297190.
-	einfo "Applying documentation fix."
-	sed -i -e 's:src doc etc:src etc:g' \
-		"${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
-
-	#Replaces the libnet-1.0 patch for inline, flexresp, and react
-	if use flexresp || use react || use inline; then
-
-		einfo "Applying libnet-1.0 fix."
-		sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-			"${WORKDIR}/${P}/configure.in" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-			"${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-			"${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-		sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-		sed -i -e 's:-lnet:-lnet-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-		sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-			"${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-	fi
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2 sdf; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-
-	local myconf
-
-	#targetbased and inline-init-failopen automaticly enable pthread
-	if use threads || use targetbased || use inline-init-failopen; then
-		myconf="${myconf} --enable-pthread"
-	fi
-
-	#Tell flexresp, react, and inline where libipq is
-	if use flexresp || use react || use inline; then
-		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-	fi
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable timestats) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable debug) \
-		$(use_enable reload) \
-		$(use_enable reload-error-restart) \
-		$(use_enable flexresp) \
-		$(use_enable flexresp2) \
-		$(use_enable react) \
-		$(use_enable aruba) \
-		$(use_enable zlib) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--disable-build-dynamic-examples \
-		--disable-corefiles \
-		--disable-ipfw \
-		--disable-profile \
-		--disable-ppm-test \
-		--without-oracle \
-		${myconf}
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-	fowners snort:snort /var/log/snort
-
-	keepdir /var/run/snort/
-	fowners snort:snort /var/run/snort/
-
-	dodoc doc/*
-	dodoc ./RELEASE.NOTES
-	docinto schemas
-	dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/sid-msg.map \
-		etc/threshold.conf \
-		etc/unicode.map \
-		|| die "Failed to add files in /etc/snort"
-
-	newins etc/snort.conf snort.conf.distrib
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		|| die "Failed to add files in /etc/snort/preproc_rules"
-
-	keepdir /etc/snort/rules/
-
-	keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-	fowners -R snort:snort /etc/snort/
-
-	if use reload; then
-		newinitd "${FILESDIR}/snort.reload.rc1" snort \
-			|| die "Failed to add snort.reload.rc1"
-	else
-		newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-	fi
-
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-	#Disable all rule files by default.
-	#Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Snort is a libpcap based packet capture tool which can be used in"
-	einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-	einfo "Detection/Prevention System Mode."
-	einfo
-	einfo "To learn more about these modes review the Snort User Manual at..."
-	einfo
-	einfo "http://www.snort.org/docs/"
-	einfo
-	einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	einfo "information on configuring snort."
-	einfo
-	einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-	einfo "recommended for all users..."
-	einfo
-	einfo "http://www.snort.org/community/mailing-lists/"
-	einfo
-	einfo "To download rules for use with Snort please, see the following"
-	einfo
-	einfo "Sourcefire's VRT Rules and older Community Rules:"
-	einfo "http://www.snort.org/pub-bin/downloads.cgi"
-	einfo
-	einfo "Emerging Threats Rules:"
-	einfo "http://www.emergingthreats.net/"
-	einfo
-	einfo "To manage updates to your rules please visit..."
-	einfo
-	einfo "http://oinkmaster.sourceforge.net/"
-	einfo
-	einfo "and then 'emerge oinkmaster'."
-	elog
-	elog "Snort Release Notes:"
-	elog "http://dl.snort.org/snort-current/release_notes_286.txt"
-	elog
-	elog "!! IMPORTANT !!"
-	elog
-	elog "There have been some changes to the config file shipped"
-	elog "with snort. Users should migrate their current snort.conf"
-	elog "to the new config file. The config file shipped with snort"
-	elog "is located in /etc/snort/snort.conf.distrib."
-	elog
-}
diff --git a/net-analyzer/snort/snort-2.9.0.4-r1.ebuild b/net-analyzer/snort/snort-2.9.0.4-r1.ebuild
deleted file mode 100644
index 22c85d467774..000000000000
--- a/net-analyzer/snort/snort-2.9.0.4-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.0.4-r1.ebuild,v 1.5 2011/04/24 17:50:15 armin76 Exp $
-
-EAPI="2"
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/808 -> ${P}-r1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~sparc ~x86"
-IUSE="static +dynamicplugin +ipv6 +zlib gre mpls targetbased +decoder-preprocessor-rules
-ppm perfprofiling linux-smp-stats inline-init-failopen prelude +threads debug
-active-response normalizer reload-error-restart react flexresp3
-aruba mysql odbc postgres selinux"
-
-DEPEND=">=net-libs/libpcap-1.0.0
-	>=net-libs/daq-0.5
-	>=dev-libs/libpcre-6.0
-	dev-libs/libdnet
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-
-	# Fix to ensure that the package builds if USE flag -dynamicplugin is used.
-	epatch "${FILESDIR}/disabledynamic.patch"
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed	for perlude failed"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable zlib) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable normalizer) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--enable-reload \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-rzb-saac \
-		--without-oracle
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
-
-	chown -R snort:snort \
-		"${D}"/var/log/snort \
-		"${D}"/var/run/snort \
-		"${D}"/etc/snort \
-		"${D}"/etc/snort/preproc_rules || die "Failed to set ownership of dirs"
-
-	newinitd "${FILESDIR}/snort.rc10" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to install snort confd file"
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib lib paths"
-
-	# Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib rule path"
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib preproc rule path"
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to uncomment snort.conf.distrib preproc rule path"
-
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to uncomment snort.conf.distrib dynamicdetection directory"
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to clean up snort.conf.distrib trailing slashes"
-
-	# Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib classification.config path"
-
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib /etc/snort/reference.config path"
-
-	# Disable all rule files by default. Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to disable rules in snort.conf.distrib"
-
-	# Disable preproc rule files by default.
-	sed -i -e 's:^include $PREPROC_RULE_PATH:# include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to disable rules in snort.conf.distrib"
-
-	# Disable normalizer preprocessor config if normalizer USE flag not set.
-	if ! use normalizer; then
-		sed -i -e 's:^preprocessor normalize:#preprocessor normalize:g' \
-			"${D}etc/snort/snort.conf.distrib" \
-			|| die "Failed to disable normalizer config in snort.conf.distrib"
-	fi
-
-}
-
-pkg_postinst() {
-	elog
-	elog "Snort-2.9 introduces the DAQ, or Data Acquisition library, for"
-	elog "packet I/O. The DAQ replaces direct calls to PCAP functions with"
-	elog "an abstraction layer that	facilitates operation on a variety of"
-	elog "hardware and software interfaces without requiring changes to Snort."
-	elog
-	elog "The only DAQ modules supported with this ebuild are AFpacket, PCAP,"
-	elog "and Dump. IPQ nad NFQ will be supported in future versions of this"
-	elog "package."
-	elog
-	elog "For passive (non-inline) Snort deployments you will want to use"
-	elog "either PCAP or AFpacket. For inline deployments you will need"
-	elog "to use AFpacket. The Dump DAQ is used for testing the various inline"
-	elog "features available in ${P}."
-	elog
-	elog "The core DQA libraries are installed in /usr/$(get_libdir)/. The libraries"
-	elog "for the individual DAQ modules (afpacket,pcap,dump) are installed in"
-	elog "/usr/$(get_libdir)/daq. To use these you will need to add the following"
-	elog "lines to your snort.conf:"
-	elog
-	elog "config daq: <DAQ module>"
-	elog "config daq_mode: <mode>"
-	elog "config daq_dir: /usr/$(get_libdir)/daq"
-	elog
-	elog "Please see the README file for DAQ for information about specific"
-	elog "DAQ modules and README.daq from the Snort 2.9 documentation"
-	elog "reguarding Snort and DAQ configuration information."
-	elog
-	elog "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	elog "information on configuring snort."
-	elog
-
-	if [[ $(date +%Y%m%d) < 20110312 ]]; then
-
-		ewarn
-		ewarn "Please note, you can not use ${P} with the SO rules from"
-		ewarn "previous versions of Snort!"
-		ewarn
-		ewarn "If you do not have a subscription to the VRT rule set and you"
-		ewarn "wish to continue using the shared object (SO) rules, you will"
-		ewarn "need to downgrade Snort. The SO rules will be made available"
-		ewarn "to registered (non-subscription) users on March 12, 2011"
-		ewarn "(30 days after being released to subscription users)."
-		ewarn
-		ewarn "Please see http://www.snort.org/snort-rules/#rules for more"
-		ewarn "details."
-		ewarn
-
-	fi
-
-}
diff --git a/net-analyzer/snort/snort-2.9.0.5.ebuild b/net-analyzer/snort/snort-2.9.0.5.ebuild
index 26942272e592..809ae857e8d3 100644
--- a/net-analyzer/snort/snort-2.9.0.5.ebuild
+++ b/net-analyzer/snort/snort-2.9.0.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.0.5.ebuild,v 1.4 2011/09/21 15:33:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.0.5.ebuild,v 1.5 2012/03/11 14:01:46 kumba Exp $
 
 EAPI="2"
 inherit eutils autotools multilib
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/867 -> ${P}.tar.gz"
+SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~mips"
 IUSE="static +dynamicplugin +ipv6 +zlib gre mpls targetbased +decoder-preprocessor-rules
 ppm perfprofiling linux-smp-stats inline-init-failopen prelude +threads debug
 active-response normalizer reload-error-restart react flexresp3
diff --git a/net-analyzer/snort/snort-2.9.1.ebuild b/net-analyzer/snort/snort-2.9.1.ebuild
index c00847bb1a40..80ed03b7c3e0 100644
--- a/net-analyzer/snort/snort-2.9.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.1.ebuild,v 1.3 2011/09/29 06:04:55 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.1.ebuild,v 1.4 2012/03/11 14:01:46 kumba Exp $
 
 EAPI="2"
 inherit eutils autotools multilib
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1107 -> ${P}.tar.gz"
+SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~mips"
 IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules
 +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response
 +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit
diff --git a/net-analyzer/snort/snort-2.9.2.ebuild b/net-analyzer/snort/snort-2.9.2.1.ebuild
index f94231717ac8..5db9ea60e909 100644
--- a/net-analyzer/snort/snort-2.9.2.ebuild
+++ b/net-analyzer/snort/snort-2.9.2.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.2.ebuild,v 1.2 2012/03/11 03:46:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.2.1.ebuild,v 1.1 2012/03/11 14:01:46 kumba Exp $
 
 EAPI="2"
 inherit eutils autotools multilib
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1347 -> ${P}.tar.gz"
+SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~mips"
 IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules
 +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response
 +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit