tcltk fix and cleanup

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

7 files changed, 27 insertions, 137 deletions

diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index 46e01103a87c..46df7e27cff2 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,22 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 40f85366aeab94c870fe61d595665be7 ChangeLog 3588
-MD5 424d2f24724379f96c1c10b866081de4 files/digest-snortalog-2.2.1 65
-MD5 9ffebf50ecd9113ef41a27a476b5bbe5 files/digest-snortalog-2.3.0-r1 65
-MD5 0002bd36bbeffb19c302cd61da9dd587 files/digest-snortalog-2.4.0 139
-MD5 af01fbfd326839abf6cf3bb9f0bc5226 files/snortalog-2.3.0-limit-args.diff 484
+AUX snortalog-2.4.0-limit-args.diff 495 RMD160 b27f7218a4708b65ee00b09761c5c4d2d4465b36 SHA1 bc6c20fd57a099d858a62662fe83427d9717ce5d SHA256 68649a6f0cdc57f56da58181f741c12f4d1475a5d879cb36eede194c2638c7a4
 MD5 a5a0841e5bd64eaa526550646dfa3f5c files/snortalog-2.4.0-limit-args.diff 495
-MD5 0b9975fa825cb3029556ddb3a722cfb3 files/snortalog-2.4.0-notcltk.diff 908
-MD5 2f2b2b3bb86008d2d74474f2523d1420 files/snortalog-notcltk.diff 813
+RMD160 b27f7218a4708b65ee00b09761c5c4d2d4465b36 files/snortalog-2.4.0-limit-args.diff 495
+SHA256 68649a6f0cdc57f56da58181f741c12f4d1475a5d879cb36eede194c2638c7a4 files/snortalog-2.4.0-limit-args.diff 495
+AUX snortalog-2.4.0-notcltk.diff 912 RMD160 8b8ae8583e1e14effb92a96f342f5044f5bac257 SHA1 c6a2c1a64fd754405f32c32a6c4e5ed0c06e6f3c SHA256 356822a108f6707c07b0546eb5847cfd5cf6bc3c2c6a637987d85f0b9f952acd
+MD5 66f4e70f16b4248df253097508b8e7fe files/snortalog-2.4.0-notcltk.diff 912
+RMD160 8b8ae8583e1e14effb92a96f342f5044f5bac257 files/snortalog-2.4.0-notcltk.diff 912
+SHA256 356822a108f6707c07b0546eb5847cfd5cf6bc3c2c6a637987d85f0b9f952acd files/snortalog-2.4.0-notcltk.diff 912
+DIST snortalog-2.4.0-fix-gui.diff.gz 3296 RMD160 8637f9e437dc611c8b3be2ba9027b1705592d9d0 SHA1 6b1c54fb3e84ef6ff853996821d25c156318793d SHA256 b690004e49847528b8eae59dde38cb5eb99ddbe246e8f0bb2c9fa61702cf75da
+DIST snortalog_v2.4.0.tgz 215079 RMD160 c8f891631041fcb44d6b31087073632a72b05492 SHA1 d3ea70b98188bf057a5bde3167cc8238b60662c6 SHA256 481fcdc8655cc5642407240eb0427fb02075e7905d20eac72e11515b19dca083
+EBUILD snortalog-2.4.0.ebuild 1759 RMD160 1d89e7727749106c58cdc73518ba5eca5c411531 SHA1 dc4cfd2f44cfeba44df332cbe72a4c8332a149a0 SHA256 eff4c3282b03663dedf18aa135f4f84b38a2a1926770bf4aa41a66675a19f719
+MD5 1fe35e156d314f392b884443e166d93a snortalog-2.4.0.ebuild 1759
+RMD160 1d89e7727749106c58cdc73518ba5eca5c411531 snortalog-2.4.0.ebuild 1759
+SHA256 eff4c3282b03663dedf18aa135f4f84b38a2a1926770bf4aa41a66675a19f719 snortalog-2.4.0.ebuild 1759
+MISC ChangeLog 3850 RMD160 832fd54ee64cd440afb93e764e271e09939782bb SHA1 406f006f950b5cb0ae42a79c398f8476f24febd1 SHA256 f72a4f1245b5a16da17fb716168b47dccb45cf357208dd135308ff25279b11c8
+MD5 02d7998afbf1900a80a8a0b1b161d0f3 ChangeLog 3850
+RMD160 832fd54ee64cd440afb93e764e271e09939782bb ChangeLog 3850
+SHA256 f72a4f1245b5a16da17fb716168b47dccb45cf357208dd135308ff25279b11c8 ChangeLog 3850
+MISC metadata.xml 245 RMD160 247d6b361dd76927238dc5242d59a32b10001ee1 SHA1 0058473377c05c7fbc6696fb3097e9be92113e56 SHA256 7ffac7d6b08f65b931b88c8400ce099804312915448e985aa1cadcfedfb77d2b
 MD5 fc4e25d7343dc6d2b44602bd3972903a metadata.xml 245
-MD5 eaf4f40d12cf9b145355dddb4f217743 snortalog-2.2.1.ebuild 781
-MD5 17ccc20feee9b19573ce0c700b0fb964 snortalog-2.3.0-r1.ebuild 1632
-MD5 c7b7268af77d547cb51c87c10860b577 snortalog-2.4.0.ebuild 1775
+RMD160 247d6b361dd76927238dc5242d59a32b10001ee1 metadata.xml 245
+SHA256 7ffac7d6b08f65b931b88c8400ce099804312915448e985aa1cadcfedfb77d2b metadata.xml 245
+MD5 31e352142c64719c008fb1d5c715b2bf files/digest-snortalog-2.4.0 509
+RMD160 32bfd8ca29f651ab678988f0137bc3068257aa32 files/digest-snortalog-2.4.0 509
+SHA256 bdea801c50868a21bb78455bbe0d1107c8485a30a9dd0a3be2a5fbbaf0a3e2a9 files/digest-snortalog-2.4.0 509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFD8J12tG5z4I8BtQoRAp38AJ96Mjq2iE2ZHA65n03FuxQzCFeFswCeOJo/
-g1bhFF3x9S0nDBcOWUeygzE=
-=PZT/
+iD8DBQFFa2/7z974XjDVpbkRAthbAKCBXhFPE/Ebf0AEHd9SJBfIGKdBhQCgi+ei
+34ar3lYV5dIVm87e+GmO32U=
+=ER/R
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.2.1 b/net-analyzer/snortalog/files/digest-snortalog-2.2.1
deleted file mode 100644
index 4b7277650dae..000000000000
--- a/net-analyzer/snortalog/files/digest-snortalog-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 123cb4ec30b782cfe541c6edc25b7642 snortalog_v2.2.1.tgz 423580
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.3.0-r1 b/net-analyzer/snortalog/files/digest-snortalog-2.3.0-r1
deleted file mode 100644
index 342d94b1896c..000000000000
--- a/net-analyzer/snortalog/files/digest-snortalog-2.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ecba49c542a65cfd383ac8ca41a3c36 snortalog_v2.3.0.tgz 438087
diff --git a/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff b/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff
deleted file mode 100644
index ed3835ad4317..000000000000
--- a/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- snortalog.pl.orig	2005-03-20 11:50:08.073875696 +0000
-+++ snortalog.pl	2005-03-20 11:50:15.618728704 +0000
-@@ -347,6 +347,10 @@
- 	$val_opt_p = $opt{p} if ( $opt_p == 1 ); 
- 	$val_opt_g = $opt{g} if ( $opt_g == 1 ); 
- 	$val_opt_l = $opt{l} if ( $opt_l == 1 ); 
-+	if ( $opt_h == 1 && $opt_p == 1) {
-+		print "Error: You can only create a pdf or an html file, not both simultaneously.\n";
-+		exit();
-+	}
- 	#
- 	# Test if kind of logs are selected else all arent chosen by default
- 	#
diff --git a/net-analyzer/snortalog/files/snortalog-notcltk.diff b/net-analyzer/snortalog/files/snortalog-notcltk.diff
deleted file mode 100644
index 4dccc02bc3f2..000000000000
--- a/net-analyzer/snortalog/files/snortalog-notcltk.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- snortalog.pl.orig	2005-03-03 17:13:06.792360520 +0000
-+++ snortalog.pl	2005-03-03 17:41:45.146131040 +0000
-@@ -45,17 +45,17 @@
- # Graphical Tool Kit Librairies
- #
- $TK = 0 ;
--$TK = eval "use Tk;1;" ;
--$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
-+#$TK = eval "use Tk;1;" ;
-+#$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
- 
- #
- # GD Librairies for charts
- #
- $GD = 0 ;
--$GD = eval "use GD::Graph::pie;1;";
--$GD = eval "use GD::Graph::bars;2;" if ($GD == 1);
--$GD = eval "use GD::Graph::lines;3;" if ($GD == 2);
--$GD = eval "use GD::Graph::area;4;" if ($GD == 3);
-+#$GD = eval "use GD::Graph::pie;1;";
-+#$GD = eval "use GD::Graph::bars;2;" if ($GD == 1);
-+#$GD = eval "use GD::Graph::lines;3;" if ($GD == 2);
-+#$GD = eval "use GD::Graph::area;4;" if ($GD == 3);
- 
- #
- # HTML and PDF manipulation libraries
diff --git a/net-analyzer/snortalog/snortalog-2.2.1.ebuild b/net-analyzer/snortalog/snortalog-2.2.1.ebuild
deleted file mode 100644
index 4f964807ddd0..000000000000
--- a/net-analyzer/snortalog/snortalog-2.2.1.ebuild
+++ /dev/null
@@ -1,28 +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/snortalog/snortalog-2.2.1.ebuild,v 1.13 2006/02/13 14:53:52 mcummings Exp $
-
-DESCRIPTION="a powerful perl script that summarizes snort logs"
-HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-S="${WORKDIR}/${PN}_v${PV%.?}"
-
-RDEPEND="dev-lang/perl
-	dev-perl/GDGraph
-	virtual/perl-Getopt-Long
-	virtual/perl-DB_File
-	dev-perl/HTML-HTMLDoc
-	dev-perl/perl-tk"
-
-src_install () {
-	dobin snortalog.pl || die "dobin failed"
-	insinto /etc/${PN}
-	doins domains hw rules
-	dodoc CHANGES README snortalog_v2.2.0.pdf
-}
diff --git a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
deleted file mode 100644
index d717179f16ff..000000000000
--- a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,54 +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/snortalog/snortalog-2.3.0-r1.ebuild,v 1.6 2006/02/13 14:53:52 mcummings Exp $
-
-inherit eutils
-
-MY_P="${PN}_v${PV}"
-
-DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz"
-HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/
-	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tcltk"
-
-S="${WORKDIR}/${MY_P%.?}"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-DB_File
-	dev-perl/HTML-HTMLDoc
-	tcltk? ( dev-perl/perl-tk
-			 dev-perl/GDGraph )"
-
-src_unpack() {
-	unpack ${MY_P}.tgz && cd ${S}
-	# one file created at a time ( pdf or html )
-	epatch ${FILESDIR}/${P}-limit-args.diff
-
-	use tcltk || epatch ${FILESDIR}/${PN}-notcltk.diff
-	use tcltk && epatch ${DISTDIR}/${P}-fix-gui.diff.gz
-	# fix paths, erroneous can access message
-	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
-		-e 's:\($domains_file = "\)\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
-		-e 's:\($rules_file = "\)\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
-		-e 's:\($hw_file = "\)\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
-		-e 's:\($lang_file = "\)\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
-		-e 's:Can access:Can not access:' \
-		snortalog.pl || die "sed snortalog.pl failed"
-}
-
-src_install () {
-	dobin snortalog.pl || die
-
-	insinto /etc/${PN}
-	doins domains hw lang rules
-
-	insinto /usr/lib/${PN}/${PV}/modules
-	doins modules/*
-	dodoc CHANGES README snortalog_v2.2.0.pdf
-}