Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 18 insertions, 69 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/Manifest b/net-analyzer/snortalog/Manifest
index 60b7d34657cd..2495a4f6ff36 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX snortalog-2.4.0-limit-args.diff 422 SHA256 1a54eb91966886c4a42162c2805bc2ab03cef0422bbb5eeb879162f3021f7b20 SHA512 4a1da7216291d108c9c1afab70f1231d59be3cf98beefea33b330e2bedf3b46a862d412e49cac224137f7b959b312ce6dc6ae9ebafb85e55de2f116be65c70c2 WHIRLPOOL 8e0cc7e256de0baf38063d3bd36bcdedc50163efd47dfc2ebf64e5f2bad0328cea9fca2911643c253ae1dc3c868e4043728801d2cf4f3ff99d063d22dff098fc
-AUX snortalog-2.4.0-notcltk.diff 835 SHA256 52c2ebc63036ab39deead8539d4c4a6236d12c601c431c6f6c765cb8705b6692 SHA512 9b51983958b646de2751d4730ffd4bfd07a6c8370eb0d07f9270f52ae3cad94a6084a3a8e4d64528d7d3718c47537df65826c162b406621661f311b2d2947566 WHIRLPOOL 97abb5f39145fbe2286392d8d3f6bd2b606216703188f3045397394dd0a52fe15081d92028bee7388f2977c0664291d324d69a6334512fe28c0f5d267705e9cc
-DIST snortalog-2.4.0-fix-gui.diff.bz2 2953 SHA256 f43366ccdf0e5ebe1919791f4d48ae38c5b601aeece5a7405d9bd764c4aa9f5b SHA512 5bc5ba5215d2c368d956597d33de41a5e8927f4209172fc077ecf8a581e0015e634ad850f5cc672f5201d8c16e96058b3e93ebf38ddcf11012563167663367e3 WHIRLPOOL dff4c53b0b5d178f3215e4cd5fae14f19a93df1235b9f249c4a73e515c7c09bc558d14c7d6ce125190fa349925328cb838787be69073e1fa8279c8060c0cb9ee
-DIST snortalog_v2.4.0.tgz 215079 SHA256 481fcdc8655cc5642407240eb0427fb02075e7905d20eac72e11515b19dca083 SHA512 f04a6cf7d4c663475f7d7dbed3ea7ec3e2ceb8a595bcf6ac81fc4678f6e549b2371fc3bc9b562679d17750953d87d01338258c23106eac128819d90dab29ca8d WHIRLPOOL 6879b81637fd91a50d36a0762f894459051d4b8ab497ca4a22d71435bdb35beaa54f50ee3ffa7be356c5666b81d15692dc5a1e667d935f2ab764cad45e250bc4
-EBUILD snortalog-2.4.0.ebuild 1697 SHA256 635561a7b3926c73519f7b099686683188db5be13ddc34d315dc29396afeb0d5 SHA512 3298c90c24bad259f1370df493d016c40d1e0dcf6d53acea471f5f556bcab05e9906b8616c11a4af3df6184acd5e61ddd579ac659949fb8e8b73aaad3bc8b936 WHIRLPOOL 8f7b91b914a3983ddc5accb87c3e8691e6cbbcef471f6a0fbb48d9eee4f0c09e4efdc9b6caa435140d77bbc397f6c86e76f678e3ec6dff3a9bdbe763bae31234
-MISC ChangeLog 4307 SHA256 e4867aeb16cfc58e3a3b052f98eefdf2679165d348fab30f96e6dc7fce0bbf4b SHA512 95f963316716b0c19c70527bc6b03268003794c288d2bc71035914247734743f74ddf9fe501d7da57986f5dd8e575e368903e608e6e7acf65e24f39cda835a6b WHIRLPOOL 0a183398635c6045c1b56ef111fb4aa9c443f42681a7c995fe63d45f9587a3d964d669e813e024c6f3f7841ab9dc1f102acbdb7b3270aea8386e362b67689b08
+DIST snortalog_v2.4.3.tar 1324032 SHA256 aa8c47dd5c52277bedb3de310717dfe9f49ca19ededbdc81fbf130b1273ca40f SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06 WHIRLPOOL e8fc7d17fa148016218b46add071548bb93a24db4dd26af3b069b9f8d55bbafdcd28a4eb2b68f86346f881b7171f5df81bfa235168496052c34776f6b005dfb3
+EBUILD snortalog-2.4.3.ebuild 1465 SHA256 e723cb80f7cc4da1cb1ab3dbd9af8f31d534f9b5d1bad960a424fcf3b73602f6 SHA512 071a3d5b3c827a62477e1a255f8291b01044bc912e39202daac012f4e8772a43c01213736104234281269f62ef527321fff653f9ba52a840a8b62914461c9c04 WHIRLPOOL f6b48cf29aa1214a9b566db9d16987cd64620c14a53b9c12e729bb0bb62249c697c8bc5457306aaca1d7d1ab18b8db4f655dec6dcd83ac758e8cc8403dd43a3b
+MISC ChangeLog 4534 SHA256 14358dc046408afb6e63ebe73c340c0ef9c5ba8b2fd572ad7e50ecac3c86b116 SHA512 4ebf319b43f5a0f9cc2cb7a1952fdce68e8f0357dad59f5ad24ac1dce5602f32d9b49034b85f2cdc4997078eb33fbb298387c4434d5fc9d2ef39d4566f42ec6c WHIRLPOOL 53a0d8a2bc22c792a1009f0153fd42682f4b93454e2229eda1126a2075ae24a9d5be7e4004edaf114d489cbfd8ba8172c8f7a16cfec455f52dbbe92e14a424a2
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPHyA0ACgkQVWmRsqeSphOa1gCfQJ0w0Krj5njTZdzIWvEoVJZ9
-ZW8AmQGI91c7cKdKDcxICwrGiHPaerpY
-=4gpj
+iEYEAREIAAYFAlPHzoAACgkQVWmRsqeSphNVPQCdGYHV0luphALAI3aWynhGpn78
+iPIAnjwQiCZDe5p0sUL08IpgUCxzCR/3
+=7cmn
 -----END PGP SIGNATURE-----
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
 }