Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 12 insertions, 60 deletions

diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index 9357d672c946..61e94c578846 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/snortalog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.25 2014/07/17 12:56:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.26 2014/07/17 13:24:15 jer Exp $
+
+*snortalog-2.4.3 (17 Jul 2014)
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -snortalog-2.4.0.ebuild,
+  +snortalog-2.4.3.ebuild, -files/snortalog-2.4.0-limit-args.diff,
+  -files/snortalog-2.4.0-notcltk.diff:
+  Version bump.
 
   17 Jul 2014; Jeroen Roovers <jer@gentoo.org> snortalog-2.4.0.ebuild,
   files/snortalog-2.4.0-limit-args.diff, files/snortalog-2.4.0-notcltk.diff,
diff --git a/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff b/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
deleted file mode 100644
index 5209dc0aa963..000000000000
--- a/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/snortalog.pl
-+++ b/snortalog.pl
-@@ -397,6 +397,12 @@
- 	$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-2.4.0-notcltk.diff b/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
deleted file mode 100644
index e82f5e4f0371..000000000000
--- a/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/snortalog.pl
-+++ b/snortalog.pl
-@@ -92,18 +92,18 @@
- # Graphical Tool Kit Librairies
- #
- $TK = 0 ;
--$TK = eval "use Tk;1;" ;
--$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
--$TK = eval "use Tk::Dialog;3;" if ($TK == 2);
-+#$TK = eval "use Tk;1;" ;
-+#$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
-+#$TK = eval "use Tk::Dialog;3;" if ($TK == 2);
- 
- #
- # 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.4.0.ebuild b/net-analyzer/snortalog/snortalog-2.4.3.ebuild
index 69abb992246b..0dfcca527c28 100644
--- a/net-analyzer/snortalog/snortalog-2.4.0.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.0.ebuild,v 1.12 2014/07/17 12:56:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.3.ebuild,v 1.1 2014/07/17 13:24:15 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -9,10 +9,7 @@ MY_P="${PN}_v${PV}"
 
 DESCRIPTION="a powerful perl script that summarizes snort logs"
 HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
-SRC_URI="
-	${HOMEPAGE}${MY_P}.tgz
-	tk? ( https://dev.gentoo.org/~jer/${P}-fix-gui.diff.bz2 )
-"
+SRC_URI="${HOMEPAGE}downloads/${PN}/${MY_P}.tar"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -27,18 +24,9 @@ RDEPEND="
 	tk? ( dev-perl/perl-tk dev-perl/GDGraph )
 "
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_prepare() {
-	# one file created at a time ( pdf or html )
-	epatch "${FILESDIR}"/${P}-limit-args.diff
-
-	if use tk ; then
-		epatch "${DISTDIR}"/${P}-fix-gui.diff.bz2
-	else
-		epatch "${FILESDIR}"/${P}-notcltk.diff
-	fi
-
 	# fix paths, erroneous can access message
 	sed -i \
 		-e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
@@ -63,5 +51,5 @@ src_install () {
 	insinto /usr/lib/snortalog/${PV}/modules
 	doins -r modules/*
 
-	dodoc doc/CHANGES
+	dodoc CHANGES doc/snortalog_v2.2.1.pdf
 }