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.

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

15 files changed, 44 insertions, 1957 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/Manifest b/net-analyzer/snort/Manifest
index 38d275fa29a0..13427ff502f1 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,41 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX disabledynamic.patch 4189 RMD160 e24db349742b5885206466ee0254457f69a18272 SHA1 63388be21fefb841740a2dd0df7684ad24f2dc40 SHA256 018cec1ffab83b65506478e33c51f26aeaddab3152a1c5c1d5b4f0952ac00fd4
-AUX pcap_memory.patch 563 RMD160 3d4ed78ee4588e09401753026e6766ebcf290743 SHA1 962cb1379af8a382cb31ac07fe21614bbe6e3f8b SHA256 fc73d20c8b414decaba2cccdb50168489e84ddf906cf3c1e9490235a15f3e065
-AUX snort-2.8.4-libnet.patch 9037 RMD160 76854b43712d9d5375263ee4aeba7161658bba6b SHA1 24ff2aa83a680c158be7876acc88cb4f47ffd85f SHA256 4659a2e141e476b7dfcb627de3c8dc884014e601a9fd9fe57e4d0c0912193650
 AUX snort.confd 442 RMD160 439e885d43aacc474c41eeed5217a498b2917aac SHA1 87a3de61e218367b2239540b94c564b2c6729300 SHA256 40adf5e7b918d1feae6728c1445e879d4cc478f81d13e9f32a2de1be1345413a
 AUX snort.confd.2 420 RMD160 66bead70bfb5752d7f9779803453bdecf2694fee SHA1 d4917da66def50d09430a0dff4b2e86103a4834a SHA256 337378f098e0cd59fb5c28a26b5b74b32168cf48596064469e6a5ba04fe3a36f
 AUX snort.rc10 1184 RMD160 e21154f031671a49c421da880ce3f56637147fbf SHA1 15b6214672e8c4512faa98e2fdd11e383e0d671b SHA256 268051b41011af92341d996105b820115089828be56d664301a662da396007ad
 AUX snort.rc11 1473 RMD160 f9d1a9bfbe88b0bcb5dbecbab3ee3fc647f0a9ff SHA1 cf97f12c9560b85d6ac12492020c5222eb4613b3 SHA256 280ed4fb18c871ca83469a4dd1485f47d422b9d4476613711707c627176e4774
-AUX snort.rc9 849 RMD160 d031761fff4cf8f7bc28a465d3b5ecc740579e21 SHA1 8c16b1f7f064ebf962ad469b55e5a6738939b8e4 SHA256 585c6e96fc2265861436347ddf52d44c1c049fe7083825e16253f7717c968ec4
-AUX snort.reload.rc1 1190 RMD160 cbe18ddc93f3091f0faef317d96211b8d7d3798d SHA1 f7b4aff2b7b25b1c8d5886e1fab63856e1ccfe06 SHA256 c6af6ff89034872a7192af360a24de811aeba7fb06704ebe758eea9dcde933e9
-DIST snort-2.8.5.1.tar.gz 4715078 RMD160 fbfab45f1d7d815516043592eab8cf1cc6ec93d0 SHA1 b971052cdd4b3527a0603854953103fe9ad8a45b SHA256 ade1b0f4ae74fd623c633d28b6f1429187751b35b36a3f8a0c197d2104b5e5ae
-DIST snort-2.8.5.3.tar.gz 4730637 RMD160 57e897b90cb177c2ef2c0cb2ad3b7494c92c6d99 SHA1 e376f546977c695b21b9a5253e5d7c69cd53c63c SHA256 a7d9eb16427514d00926e9892c4a92b6ff1fd0f79555d8f8dce91dfa14112e6a
-DIST snort-2.8.6.1.tar.gz 4939019 RMD160 27925c0df9debc9e60e19a0c989db28c8d1ca7f0 SHA1 66e991f151f6aae5dcdee92abc8092cd508a2aaa SHA256 7a948ef235c59b193ca0883b04a0d3ef4cc5250f933cafc4d06feed57150ae23
-DIST snort-2.8.6.tar.gz 4960740 RMD160 5b549eab39a6e0a0f182f6d2ee46fd60995c822e SHA1 e463c99994e52171439623e1b05b9e1bcf01ac8f SHA256 6064d7bb78d6438b455ff349b93d52f40d3977f1fecb1d7958c87881b0030358
-DIST snort-2.9.0.4-r1.tar.gz 5812096 RMD160 e33ff54d72334413cf7970c418370e4f8a953c9e SHA1 a803fae561f829c2dad7e61f0a9b8f75f72356de SHA256 053d1562f4ffc1793188f0d2475c043ddae42b33f8b93be45d7e67dbc7424b8d
 DIST snort-2.9.0.5.tar.gz 5867934 RMD160 668c586c8cfab905c18af08ca6b61b96dddb398a SHA1 b4565d3a8387f6b5e7aceb3aee80803ceabf80f2 SHA256 f997fddbbd1a5f7ccdd4153610b0916fcbe105ea3316d4ed3487fd0054287e94
 DIST snort-2.9.1.tar.gz 6217639 RMD160 81070dd6b18f106368473c396d82261e7db1dc3d SHA1 b1ae80bbfd9145cae89c6249f4b5176fbccbf90d SHA256 1e69de95c8956191b26d19138a2fb7b6f2faf519f601aa3c7d779593c48830c2
-DIST snort-2.9.2.tar.gz 6467539 RMD160 a7fbd23086e87e5371a16ac25a6a6e0e740e94ad SHA1 b903e6e71b0bbf58703d9b1d8d9253807b9656f8 SHA256 04d375b627dd256d6257f2cbe5a770e4552e3f35d5e2100b97f75426b600d8cb
-EBUILD snort-2.8.5.1.ebuild 10255 RMD160 c20884731d63f87fda08c4cefc27032f32a45fcc SHA1 78fba4dd7e17177071fcfc043c6d268dfd1c0fe1 SHA256 4712367f62d48e94d0ada7c53e1902e2b9215f990b176186f80d9513dee43e81
-EBUILD snort-2.8.5.3.ebuild 10255 RMD160 8664ac1012b5cd104fcef298a29c6e7e2f33e4fa SHA1 efc68f670381a50fea54ebac6ed49447732340c6 SHA256 88ed50e2f114af64e037fdf62d7ffbcf8d52a6fd8b632bbd482e3b458b1ba1ed
-EBUILD snort-2.8.6.1.ebuild 10453 RMD160 7028aad5e61746e33a6f87134f33a074ae8424c8 SHA1 ac13164766e99b9efb8b564b980bd09e08f6738d SHA256 3703979c75830d335cd03a77fd68b85e001f586c6c598b05e84648ee35994809
-EBUILD snort-2.8.6.ebuild 10130 RMD160 c2b00348106ddd42fd1d85e81379172a967f362e SHA1 2da5ff9240446e00237e8fe81a1001d85d20d1e3 SHA256 8788b91ef4b8ad8b6e3ca7bcb456afa94f497b454a3098201c977c0e0f6584a6
-EBUILD snort-2.9.0.4-r1.ebuild 9893 RMD160 d2c79206d777528bf798737d53f4d3b8cfcbff3c SHA1 c20ce779028cb97368fcaff15443abeff38c04b3 SHA256 33abee6ef5d662cb3854f268cf3dd596a281b2c10b5d15e87f5ac2cc7204e815
-EBUILD snort-2.9.0.5.ebuild 10179 RMD160 1bff0dc4e6489fbefd6452fe27743f9b092efd55 SHA1 c742d26a91a26007d523f6cc2fb45e6948422ff3 SHA256 72c4194ee295d96529f6d6d30a12bc3b60f3a312a3a59cc0983fdc9e24195d37
-EBUILD snort-2.9.1.ebuild 9303 RMD160 c3f60e913f05a6bf3f0548832c45de9ac223c74a SHA1 7d2dfdd4df77af8b12a89f0fa76769a025eb5dc3 SHA256 46020d7219b5a6ac5ecae19035d754e3ba1c78b78667e0f11b2d12a14516e1a8
-EBUILD snort-2.9.2.ebuild 9325 RMD160 4b9c8339d400cf6c8eff82518dc3d2f8a3a7d0ee SHA1 613c4cf5a39204e549edc6050fb0abdd77ef105e SHA256 2606355c6f1dbd4283b4a228eda89ebe852128ea7cb884c501eb3506c0af6b01
-MISC ChangeLog 32766 RMD160 aac949036360b06c1958ff6196214c41f5238189 SHA1 1e15ecff2ab76317f59fb9d11c6cc5aacb65e9db SHA256 2744c6738580aa680ea8c645b562833cfbc9ebf18d032a49f2bc4da05b602765
-MISC metadata.xml 5524 RMD160 d307f40c1dfece37a0bf5bdc9264141bdd86f61a SHA1 0b88ce23a95d7c96ffb15609761d143c64ba1c10 SHA256 621972507e7e2d501d947c4acefc1d5a700173171f95d838a675bcfca135251d
+DIST snort-2.9.2.1.tar.gz 6522229 RMD160 1a2b40980552092b4dfad6664e6facccba9d0ecf SHA1 1ae18ffc7cafe6f2590e06441d15a1b1519f8483 SHA256 4ec549fc2b0df5e89b2dc0453eabf3499f7da2fa88cd004a084ffa1109cbffa5
+EBUILD snort-2.9.0.5.ebuild 10182 RMD160 c27c1ba991d7208be2d3d8f68a6c87d7d262d05e SHA1 ba00424bb9d72f099e8d11a4decdd081932f4747 SHA256 b8c1d0e547acb33e24fee1e44d23277168e575404f3c63357b117e769f72624e
+EBUILD snort-2.9.1.ebuild 9308 RMD160 22b75357e1309e29a99c055e0dfa1035586a5c1f SHA1 fa2dae91b1ca25f9a2f24300d6138cb2cdb8b52f SHA256 a1bdeeab781c97149890ca099c3ab3fe30d9bdc63509d7e31c882e72c8afc06d
+EBUILD snort-2.9.2.1.ebuild 9328 RMD160 ce0cbb5279b582c48d89a10693646d7ffbcfea0b SHA1 0e1c87e9370a599b82ed664cba8cc0d06b608773 SHA256 d71c8fac7c690ee0147a15dfadc22a18aa158dd1db29719b3346ee95c84928b6
+MISC ChangeLog 33358 RMD160 179f73049665454d4488ad206c667fbba574bf6e SHA1 28ef55429cc4a2905ceb5ea7aa68389750a27b2b SHA256 f1eb4ab0eb6fbb9d36a1fff31075ce572683dc507de7fceddbbddbb4dca93ab1
+MISC metadata.xml 4663 RMD160 2187b0202dd685045a9e4d81f3b0800660b6ee0b SHA1 2b419f3ef46fb8c4fd40f69b976e3d4dff6bf878 SHA256 40d07671b44a9025df3eec2c8554358e1f7b5d967b32f2e306d38f3ae171a56d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPXCAKAAoJEEqz6FtPBkyjSqkH/ixnUa7ieNsv6B7C3CVsUTid
-cyWtcbzzY1n2kp+XjGHFUycjyuX1YTDN1ui4sgXKrmNoElJJmGXVJu/TmA4PwI2p
-ZbiP2PlwSyc1nid6zBV9z/8wOfPBnuDkoFFo7/OApWC2nXqmjJRcqfOJ7KVNob6n
-2mnu3G0R4sqDHg7Cxt+KEQ1roGffXh9no9ICZ47sm32kmCqmSOvSMcNxKtDwL7w1
-6meCRXncjzhixCff10qu5M5Xt1oN2JschkJfiJuAYYRcZqWPu7jA3q9vSFa6WS6A
-j0U6w3l41Ada9KL356iSWMtNmWHUU+AkuZOmsT4aH32IybXPY4RIOPDfmLfBOjY=
-=dQt1
+iQIcBAEBAgAGBQJPXHgtAAoJENsjoH7SXZXjqEYQAI8uCbrwYgCPyQJSzvYuPWSQ
+fUfvnbLI1yCi6BBXtPYUQ+1tXX5zCrKxooqBc5KeWfaWIAPPQINBkzhW4uXSPPyi
+Cl6vLavBKYFcCT8fr4aaNlYIXlwmL/Jgr/KZcKnz2pr7JgVT4t7phkDgKO4IROTe
+F1UxkYetkY0kBzBH/b4ToUCz0BEsevD4fSJ+mPDiCKJUQf5s2KQQpM3f8oVzT6bJ
+S8VOYQTSeaRtJWr0lpO92IEPz23QXAcSXJVrHf9wQWaJfXhJEd8WmaMs1eqq05SM
+o1SbDo+YxeycueCOF5SdeD4/XBN68m7QQ0ymxXzeGT+eH/aYe1pkoWWTyfqiG/Lo
+E2dnQjyLbHgrwf5Najs5aJVsuWaiosa6vrpHzGEbmTe/IXtVbqUKRWfaE41FguQU
+Cp5ijb0T4hBd2XOByeScf+gzAVP4ppRSB4uA3OEKuzKN+qhi2yYMF8Ea5UsCJwxn
+5HPFyl/KCIE9OOvWI5yFn7CvPRGZfLNgU+0SVuzj/EuUEkD5llgLfWONzWU+r9+V
+ah9o23OmJibb+QspWgYnBWa7Yk42rthUoQ3TZOEyWcAL66DvpHf+rVbr2Vrkn9yy
+vdCbfWnYgBRARdaHSY4li54v41vKIwVygGHTBQL4JYGG2stUZkRiW0ADq75L1iBJ
+2bED8iIGVeMj/UGG61Tf
+=WClH
 -----END PGP SIGNATURE-----
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