Remove old ebuilds, add patch from bug 155955 to allow ciscoacl plugin to work with gcc-4.1.1. Thanks to Paul Kehrer <paul at victoly dot com>.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

5 files changed, 13 insertions, 112 deletions

diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 7766d502d3ae..96762ca9a154 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -2,11 +2,11 @@ AUX snortsam-2.29-no-ugly----lines.diff 1665 RMD160 96e1ed518c462991430c3413f810
 MD5 0be28257a995a317341b1d367535cb38 files/snortsam-2.29-no-ugly----lines.diff 1665
 RMD160 96e1ed518c462991430c3413f810dd9cc7af9845 files/snortsam-2.29-no-ugly----lines.diff 1665
 SHA256 9fd58962944045d660b6ca703e520dbccfae9b596e09e2dde0fd2ba838c0f51a files/snortsam-2.29-no-ugly----lines.diff 1665
+DIST snortsam-2.50-ciscoacl.diff.bz2 7295 RMD160 91d36fecc3fcf14de5ed964928d69ef3cc167bae SHA1 c887162193df59bff2f3fb2fe0ae0aec253314ce SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b
 DIST snortsam-src-2.30.tar.gz 1009013
 DIST snortsam-src-2.31.tar.gz 1011337
-DIST snortsam-src-2.36.tar.gz 1041503
 DIST snortsam-src-2.44.tar.gz 1071400
-DIST snortsam-src-2.50.tar.gz 1073391 RMD160 d4cc56f2f5d87254784f4b03b639bce943b8530d SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441
+DIST snortsam-src-2.50.tar.gz 1073391 RMD160 d4cc56f2f5d87254784f4b03b639bce943b8530d SHA1 59dd84b53c7af0c7c487160d2016395883c2a58f SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441
 EBUILD snortsam-2.30.ebuild 1200 RMD160 9bb20354f63d3d3b1b78ff4b158086c7619fc9bc SHA1 ed8a9bd411bdcedc3b57bce35ee546666e9e985d SHA256 9a6da2fb8f3d4e7a35d2583ff6aec0ca65589d9027e450e614365553eb3b4615
 MD5 8fcc3cb2942cc32a1d61eaa9d511f930 snortsam-2.30.ebuild 1200
 RMD160 9bb20354f63d3d3b1b78ff4b158086c7619fc9bc snortsam-2.30.ebuild 1200
@@ -15,22 +15,18 @@ EBUILD snortsam-2.31.ebuild 1211 RMD160 75d4701d1b424d37526e89f097b225f87f7021a5
 MD5 21a4d32d50fdc886a60dfb3e6a4257eb snortsam-2.31.ebuild 1211
 RMD160 75d4701d1b424d37526e89f097b225f87f7021a5 snortsam-2.31.ebuild 1211
 SHA256 41368b64b855fe921f6c680918da63d076dfa9926b7c63216d1dc9ae3ee4dd2f snortsam-2.31.ebuild 1211
-EBUILD snortsam-2.36.ebuild 1215 RMD160 de3c93ad2bbbc72f696ed557a56e9a745e2a5919 SHA1 c1b90dea4b2f2e660e5dec89aab8e293dcd5f4ac SHA256 d493908e4aae60cf32b24d18390414784297cb4b6906e2ad117efa3cf4c5ef72
-MD5 a4c5d35c3cd8f3d1b4e98c5714739e8e snortsam-2.36.ebuild 1215
-RMD160 de3c93ad2bbbc72f696ed557a56e9a745e2a5919 snortsam-2.36.ebuild 1215
-SHA256 d493908e4aae60cf32b24d18390414784297cb4b6906e2ad117efa3cf4c5ef72 snortsam-2.36.ebuild 1215
 EBUILD snortsam-2.44.ebuild 1223 RMD160 c96e2f2b9297b961667df5d3f95398df8180fe36 SHA1 6218c3c7e5af39b2203efa72eecdef02b3e259cb SHA256 39a4552ec03b1091b079ba774e8c99c27d172ad734f978c2404b199575e71187
 MD5 3a1dc47dad265fef2ef88985aa2ee37a snortsam-2.44.ebuild 1223
 RMD160 c96e2f2b9297b961667df5d3f95398df8180fe36 snortsam-2.44.ebuild 1223
 SHA256 39a4552ec03b1091b079ba774e8c99c27d172ad734f978c2404b199575e71187 snortsam-2.44.ebuild 1223
-EBUILD snortsam-2.50.ebuild 1208 RMD160 dad4b77b86fa93f96824c1434093c3d105c64932 SHA1 6877e04d373cb56df703e92aaee910caa264fd97 SHA256 ceabea695b8fda6cd3fd7a6eb7e63711587b158d10ca69ff0f47c5eb6a90e112
-MD5 33bdfbf60601819205b2f194fd06b78b snortsam-2.50.ebuild 1208
-RMD160 dad4b77b86fa93f96824c1434093c3d105c64932 snortsam-2.50.ebuild 1208
-SHA256 ceabea695b8fda6cd3fd7a6eb7e63711587b158d10ca69ff0f47c5eb6a90e112 snortsam-2.50.ebuild 1208
-MISC ChangeLog 2230 RMD160 d6d6d71fcb21ef958645e70424cdaa9399cdb021 SHA1 b9478155aaa9a5352de7c5dd731166e492458bd4 SHA256 fbda877028a8b06fc8cca29e53c5258a20518600fa6971f9e7a491aac3b0543d
-MD5 9923ad9b98ad7728a686b53f21992db1 ChangeLog 2230
-RMD160 d6d6d71fcb21ef958645e70424cdaa9399cdb021 ChangeLog 2230
-SHA256 fbda877028a8b06fc8cca29e53c5258a20518600fa6971f9e7a491aac3b0543d ChangeLog 2230
+EBUILD snortsam-2.50-r1.ebuild 1359 RMD160 a9f7ad2e021fa6711903a5b61eba7dd9d5cf92b9 SHA1 e20476238d2adb31cbabcf1e7da9c5ac97033ddd SHA256 d731b80cbfe2e503e5dee332836eab1eaf2f85ffb9a9920da74fd5fa2943003a
+MD5 b39dbdbba34e52f9ea76e5407824d6e4 snortsam-2.50-r1.ebuild 1359
+RMD160 a9f7ad2e021fa6711903a5b61eba7dd9d5cf92b9 snortsam-2.50-r1.ebuild 1359
+SHA256 d731b80cbfe2e503e5dee332836eab1eaf2f85ffb9a9920da74fd5fa2943003a snortsam-2.50-r1.ebuild 1359
+MISC ChangeLog 2541 RMD160 6947767b3ccd3a638c835e8985c5b85798c84764 SHA1 87ceaba4f7e780590fe6d9e2a5a84e6471d63d6d SHA256 6620144589c41fac3fc763a117417db8f422b108fd7da257e3abfd99746b8a57
+MD5 c3f9e7ee18060e81383af815dabb3bbc ChangeLog 2541
+RMD160 6947767b3ccd3a638c835e8985c5b85798c84764 ChangeLog 2541
+SHA256 6620144589c41fac3fc763a117417db8f422b108fd7da257e3abfd99746b8a57 ChangeLog 2541
 MISC metadata.xml 275 RMD160 5c13a5b966876b91c33b523878247da0676786be SHA1 ab1cdfc2553ebfb64e7b62bee4f627d58ce8ed0f SHA256 b67561a55b3667bc0e6ca54a4c459227ce10c6720951cf89cdd001753cabb09d
 MD5 5b4a8eb28c662d274a2a6fd3ca87c3c1 metadata.xml 275
 RMD160 5c13a5b966876b91c33b523878247da0676786be metadata.xml 275
@@ -41,12 +37,9 @@ SHA256 3e5583f1ca13cda92a5d768c4cc345adf93cd0654fc579a065ac01e137dfeaca files/di
 MD5 60effdf575c3dff7ee6ea78698eb827b files/digest-snortsam-2.31 70
 RMD160 cbf7cf48c1b72f1db93a809b1ec2046e3177a5da files/digest-snortsam-2.31 70
 SHA256 bb0c5770fe699f4eb4a06f28798278166230faf9555fb9c712d719dcb49f942b files/digest-snortsam-2.31 70
-MD5 a49362a2ae2aae66e50cf737ca7b5c48 files/digest-snortsam-2.36 70
-RMD160 1016946367d2d4acb035113f290b0dce540cd780 files/digest-snortsam-2.36 70
-SHA256 4eba7464bc758175abb969b38f85be3e658836378b2da26099248e652d23a037 files/digest-snortsam-2.36 70
 MD5 b20f3d25415f844611074035dfb3be43 files/digest-snortsam-2.44 70
 RMD160 592ce7816b13faf5428c0487aa44dea906d4f2f8 files/digest-snortsam-2.44 70
 SHA256 fe45e2095face361c04ccdd166453964fd17758348739e6787e3efa79580f562 files/digest-snortsam-2.44 70
-MD5 e43b3a1de2c3c743b26978f7e55f91e0 files/digest-snortsam-2.50 256
-RMD160 34311569d80dec013d161348852c40744c6376bc files/digest-snortsam-2.50 256
-SHA256 ecb0d335f8cb039011f85b92e5e2f09276c0d3ffd44befff651ea11c352dbd9d files/digest-snortsam-2.50 256
+MD5 c3df286f5788a2f937a6159a2d09dd7d files/digest-snortsam-2.50-r1 524
+RMD160 b370078f5d7945514cb347a003d774ab252d9be2 files/digest-snortsam-2.50-r1 524
+SHA256 a989330eee7f8e20a09c1610860c19073194830b82add2ad36057f8004b9a7ea files/digest-snortsam-2.50-r1 524
diff --git a/net-analyzer/snortsam/files/digest-snortsam-2.36 b/net-analyzer/snortsam/files/digest-snortsam-2.36
deleted file mode 100644
index 650b8be87f14..000000000000
--- a/net-analyzer/snortsam/files/digest-snortsam-2.36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06c27aa7d7479fd92179fe91005b2ad5 snortsam-src-2.36.tar.gz 1041503
diff --git a/net-analyzer/snortsam/files/digest-snortsam-2.50 b/net-analyzer/snortsam/files/digest-snortsam-2.50
deleted file mode 100644
index cd4010f15ee1..000000000000
--- a/net-analyzer/snortsam/files/digest-snortsam-2.50
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b599e706079c170ea53fc9ec3a184e88 snortsam-src-2.50.tar.gz 1073391
-RMD160 d4cc56f2f5d87254784f4b03b639bce943b8530d snortsam-src-2.50.tar.gz 1073391
-SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441 snortsam-src-2.50.tar.gz 1073391
diff --git a/net-analyzer/snortsam/snortsam-2.36.ebuild b/net-analyzer/snortsam/snortsam-2.36.ebuild
deleted file mode 100644
index 1411ed59438a..000000000000
--- a/net-analyzer/snortsam/snortsam-2.36.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.36.ebuild,v 1.1 2005/07/29 16:39:42 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam-v2_multi-threaded/${PN}-src-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.29-no-ugly----lines.diff
-}
-
-src_compile() {
-	sed -i "s: -O2 : ${CFLAGS} :" makesnortsam.sh || die "sed failed"
-	sh makesnortsam.sh || die "makesnortsam.sh failed"
-}
-
-src_install() {
-	find ${S} -type d -name CVS -exec rm -rf {} \;
-	find ${S} -type f -name "*.asc" -exec rm -f {} \;
-	dobin snortsam || die "dobin failed"
-	dodoc docs/* conf/*
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	einfo "Read the INSTALL file to configure snort for snortsam, and configure"
-	einfo "snortsam for your particular firewall."
-	echo
-}
-
-
diff --git a/net-analyzer/snortsam/snortsam-2.50.ebuild b/net-analyzer/snortsam/snortsam-2.50.ebuild
deleted file mode 100644
index 08eaedb64c1c..000000000000
--- a/net-analyzer/snortsam/snortsam-2.50.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50.ebuild,v 1.2 2006/09/16 15:13:31 corsair Exp $
-
-inherit eutils
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.29-no-ugly----lines.diff
-}
-
-src_compile() {
-	sed -i "s: -O2 : ${CFLAGS} :" makesnortsam.sh || die "sed failed"
-	sh makesnortsam.sh || die "makesnortsam.sh failed"
-}
-
-src_install() {
-	find "${S}" -type d -name CVS -exec rm -rf {} \;
-	find "${S}" -type f -name "*.asc" -exec rm -f {} \;
-	dobin snortsam || die "dobin failed"
-	dodoc docs/* conf/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	einfo "Read the INSTALL file to configure snort for snortsam, and configure"
-	einfo "snortsam for your particular firewall."
-	einfo
-
-}