6 files changed, 102 insertions, 23 deletions
diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index 5085b2e97a7e..e210fe09c3e3 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/snortalog
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.8 2004/11/28 16:57:35 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.9 2005/03/07 10:43:53 ka0ttic Exp $
+
+*snortalog-2.3.0 (07 Mar 2005)
+
+  07 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortalog-notcltk.diff, snortalog-2.2.1.ebuild,
+  +snortalog-2.3.0.ebuild:
+  Version bump; also added patch that makes Tcl/tk support optional (via
+  USE=tcltk). Thanks to Marco Morales for the ebuild and patch in bug 83987.
 
   28 Nov 2004; Eldad Zack <eldad@gentoo.org> snortalog-2.2.1.ebuild:
   Completed dependencies. Closes Bug 72090.
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index 1974bc1bba12..b135f32c18d2 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9289bc6c90de7675e9edab56f785de79 ChangeLog 1210
+MD5 e786e895738022f714e60c6f3807145f snortalog-2.3.0.ebuild 1344
+MD5 ad81590f92944c22a5aec89371f07b70 ChangeLog 1528
 MD5 fc4e25d7343dc6d2b44602bd3972903a metadata.xml 245
-MD5 07382b8db572d578dbf043ff022b2e80 snortalog-2.2.1.ebuild 894
+MD5 3c6299c73242108db6f0c15e9db57df6 snortalog-2.2.1.ebuild 771
 MD5 424d2f24724379f96c1c10b866081de4 files/digest-snortalog-2.2.1 65
+MD5 9ffebf50ecd9113ef41a27a476b5bbe5 files/digest-snortalog-2.3.0 65
+MD5 2f2b2b3bb86008d2d74474f2523d1420 files/snortalog-notcltk.diff 813
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBqgIBT+MN7JbqCpMRAuM9AJ4y7VvGzT1nNAlsAOy83MNBFfIqZwCgja3Y
-sI7woeuvo8nXVCSgPXivGoc=
-=ZXKb
+iD8DBQFCLDByEZCkKN40op4RAqe/AJ0e8QG/p+qWfHct+RoZdpZaAC3g1QCgiWz+
+vJ1Rx0pDf8+OKutK8ofmJP8=
+=Kxrj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.3.0 b/net-analyzer/snortalog/files/digest-snortalog-2.3.0
new file mode 100644
index 000000000000..342d94b1896c
--- /dev/null
+++ b/net-analyzer/snortalog/files/digest-snortalog-2.3.0
@@ -0,0 +1 @@
+MD5 2ecba49c542a65cfd383ac8ca41a3c36 snortalog_v2.3.0.tgz 438087
diff --git a/net-analyzer/snortalog/files/snortalog-notcltk.diff b/net-analyzer/snortalog/files/snortalog-notcltk.diff
new file mode 100644
index 000000000000..4dccc02bc3f2
--- /dev/null
+++ b/net-analyzer/snortalog/files/snortalog-notcltk.diff
@@ -0,0 +1,26 @@
+--- 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
index 6af2f26ae6c7..8ad5c6d1ab1a 100644
--- a/net-analyzer/snortalog/snortalog-2.2.1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.2.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.9 2004/11/28 16:57:35 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.2.1.ebuild,v 1.10 2005/03/07 10:43:53 ka0ttic Exp $
 
 DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
 HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
 
-# Missing dep: dev-perl/HTML-HTMLDoc. Do not move to stable. see bug 72090. (2004 Nov 22 eldad)
-KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-S=${WORKDIR}/${PN}_v${PV%.?}
+S="${WORKDIR}/${PN}_v${PV%.?}"
 
 RDEPEND="dev-lang/perl
 	dev-perl/GDGraph
@@ -21,14 +20,9 @@ RDEPEND="dev-lang/perl
 	dev-perl/HTML-HTMLDoc
 	dev-perl/perl-tk"
 
-src_compile() {
-	einfo "Nothing to compile."
-}
-
 src_install () {
-
-	dodir /usr/bin
-	cp ${S}/snortalog.pl ${D}/usr/bin
-
-	dodoc CHANGES README domains hw rules snortalog_v2.2.0.pdf
+	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.ebuild b/net-analyzer/snortalog/snortalog-2.3.0.ebuild
new file mode 100644
index 000000000000..b08fa5224c90
--- /dev/null
+++ b/net-analyzer/snortalog/snortalog-2.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/03/07 10:43:53 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="a powerful perl script that summarizes snort logs"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tcltk"
+
+S="${WORKDIR}/${PN}_v${PV%.?}"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Getopt-Long
+	dev-perl/DB_File
+	dev-perl/HTML-HTMLDoc
+	tcltk? ( dev-perl/perl-tk
+			 dev-perl/GDGraph )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	use tcltk || epatch ${FILESDIR}/${PN}-notcltk.diff
+	# fix paths
+	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:' \
+		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
+}