EAPI bump. Clean up patches.

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

5 files changed, 34 insertions, 28 deletions

diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index 945b020858bc..9357d672c946 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/snortalog
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.24 2010/07/19 21:51:23 maekke Exp $
+# 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 $
+
+  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,
+  metadata.xml:
+  EAPI bump. Clean up patches.
 
   19 Jul 2010; Markus Meier <maekke@gentoo.org> snortalog-2.4.0.ebuild:
   add ~arm, bug #301084
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
index 2678a969117f..5209dc0aa963 100644
--- a/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
+++ b/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
@@ -1,5 +1,5 @@
---- snortalog.pl.orig	2005-04-13 04:42:06.000000000 -0400
-+++ snortalog.pl	2005-04-14 00:36:20.000000000 -0400
+--- 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 ); 
diff --git a/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff b/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
index ade9cf293706..e82f5e4f0371 100644
--- a/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
+++ b/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
@@ -1,5 +1,5 @@
---- ./snortalog.pl.orig	2006-11-27 23:55:00.000000000 +0100
-+++ ./snortalog.pl	2006-11-27 23:58:24.000000000 +0100
+--- a/snortalog.pl
++++ b/snortalog.pl
 @@ -92,18 +92,18 @@
  # Graphical Tool Kit Librairies
  #
diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml
index 746d8815dfcc..03aa50bab7e3 100644
--- a/net-analyzer/snortalog/metadata.xml
+++ b/net-analyzer/snortalog/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>a powerfull perl script that summarizes snort logs</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snortalog/snortalog-2.4.0.ebuild b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
index 30990bb0afda..69abb992246b 100644
--- a/net-analyzer/snortalog/snortalog-2.4.0.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
@@ -1,56 +1,58 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.11 2010/07/19 21:51:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.0.ebuild,v 1.12 2014/07/17 12:56:43 jer Exp $
 
+EAPI=5
 inherit eutils
 
 MY_P="${PN}_v${PV}"
 
 DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/snortalog/${MY_P}.tgz
-	tk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
 HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+SRC_URI="
+	${HOMEPAGE}${MY_P}.tgz
+	tk? ( https://dev.gentoo.org/~jer/${P}-fix-gui.diff.bz2 )
+"
 LICENSE="GPL-2"
 SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="tk"
 
-DEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-DB_File
+RDEPEND="
+	dev-lang/perl
 	dev-perl/HTML-HTMLDoc
-	tk? ( dev-perl/perl-tk dev-perl/GDGraph )"
-RDEPEND=${DEPEND}
+	virtual/perl-DB_File
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/perl-tk dev-perl/GDGraph )
+"
 
 S="${WORKDIR}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# one file created at a time ( pdf or html )
-	epatch "${FILESDIR}/${P}-limit-args.diff"
+	epatch "${FILESDIR}"/${P}-limit-args.diff
 
 	if use tk ; then
-		epatch "${DISTDIR}/${P}-fix-gui.diff.gz"
+		epatch "${DISTDIR}"/${P}-fix-gui.diff.bz2
 	else
-		epatch "${FILESDIR}/${P}-notcltk.diff"
+		epatch "${FILESDIR}"/${P}-notcltk.diff
 	fi
 
 	# fix paths, erroneous can access message
-	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
+	sed -i \
+		-e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
 		-e 's:\($domains_file = "\)conf/\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($rules_file = "\)conf/\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($picts_dir ="\)picts\(".*\):\1/etc/snortalog/picts\2:' \
 		-e 's:\($hw_file = "\)conf/\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($lang_file ="\)conf/\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:Can access:Cannot access:' \
-		snortalog.pl || die "sed snortalog.pl failed"
+		snortalog.pl || die
 }
 
 src_install () {
-	dobin snortalog.pl || die
+	dobin snortalog.pl
 
 	insinto /etc/snortalog
 	doins conf/{domains,hw,lang,rules}