tcltk fix and cleanup

(Portage version: 2.1.2_rc2-r2)

4 files changed, 36 insertions, 24 deletions

diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index e86ddb0a2273..6bbad635f108 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/snortalog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.21 2006/02/13 14:53:52 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.22 2006/11/27 23:09:10 jokey Exp $
+
+  27 Nov 2006; Markus Ullmann <jokey@gentoo.org>
+  -files/snortalog-2.3.0-limit-args.diff,
+  files/snortalog-2.4.0-notcltk.diff, -files/snortalog-notcltk.diff,
+  -snortalog-2.2.1.ebuild, -snortalog-2.3.0-r1.ebuild,
+  snortalog-2.4.0.ebuild:
+  tcltk fix and cleanup
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   snortalog-2.2.1.ebuild, snortalog-2.3.0-r1.ebuild, snortalog-2.4.0.ebuild:
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.4.0 b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
index 593644498857..5165311f2738 100644
--- a/net-analyzer/snortalog/files/digest-snortalog-2.4.0
+++ b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
@@ -1,2 +1,6 @@
-MD5 f7ff35957ea9870f630973f33f2f2cff snortalog_v2.4.0.tgz 215079
 MD5 59f8f3776911602036fea765ce95288a snortalog-2.4.0-fix-gui.diff.gz 3296
+RMD160 8637f9e437dc611c8b3be2ba9027b1705592d9d0 snortalog-2.4.0-fix-gui.diff.gz 3296
+SHA256 b690004e49847528b8eae59dde38cb5eb99ddbe246e8f0bb2c9fa61702cf75da snortalog-2.4.0-fix-gui.diff.gz 3296
+MD5 f7ff35957ea9870f630973f33f2f2cff snortalog_v2.4.0.tgz 215079
+RMD160 c8f891631041fcb44d6b31087073632a72b05492 snortalog_v2.4.0.tgz 215079
+SHA256 481fcdc8655cc5642407240eb0427fb02075e7905d20eac72e11515b19dca083 snortalog_v2.4.0.tgz 215079
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 ce4858134fe6..ade9cf293706 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	2005-04-14 00:52:36.000000000 -0400
-+++ snortalog.pl	2005-04-14 00:53:31.000000000 -0400
+--- ./snortalog.pl.orig	2006-11-27 23:55:00.000000000 +0100
++++ ./snortalog.pl	2006-11-27 23:58:24.000000000 +0100
 @@ -92,18 +92,18 @@
  # Graphical Tool Kit Librairies
  #
diff --git a/net-analyzer/snortalog/snortalog-2.4.0.ebuild b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
index 1516a2bd5968..c34879e34af8 100644
--- a/net-analyzer/snortalog/snortalog-2.4.0.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
@@ -1,40 +1,42 @@
 # 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.4.0.ebuild,v 1.8 2006/02/13 14:53:52 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.0.ebuild,v 1.9 2006/11/27 23:09:10 jokey 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
-	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
+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="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="tcltk"
+IUSE="tk"
 
-S="${WORKDIR}/${MY_P%.?}"
-
-RDEPEND="dev-lang/perl
+DEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long
 	virtual/perl-DB_File
 	dev-perl/HTML-HTMLDoc
-	tcltk? ( dev-perl/perl-tk
-			 dev-perl/GDGraph )"
+	tk? ( dev-perl/perl-tk dev-perl/GDGraph )"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}"
 
 src_unpack() {
-	[[ -d ${S} ]] || mkdir ${S}
-	cd ${S}
 	unpack ${A}
+	cd "${S}"
 
 	# one file created at a time ( pdf or html )
-	epatch ${FILESDIR}/${P}-limit-args.diff
+	epatch "${FILESDIR}/${P}-limit-args.diff"
 
-	use tcltk || epatch ${FILESDIR}/${P}-notcltk.diff
-	use tcltk && epatch ${DISTDIR}/${P}-fix-gui.diff.gz
+	if use tk ; then
+		epatch "${DISTDIR}/${P}-fix-gui.diff.gz"
+	else
+		epatch "${FILESDIR}/${P}-notcltk.diff"
+	fi
 
 	# fix paths, erroneous can access message
 	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
@@ -50,15 +52,14 @@ src_unpack() {
 src_install () {
 	dobin snortalog.pl || die
 
-	insinto /etc/${PN}
+	insinto /etc/snortalog
 	doins conf/{domains,hw,lang,rules}
 
-	insinto /etc/${PN}/picts
+	insinto /etc/snortalog/picts
 	doins picts/*
 
-	insinto /usr/lib/${PN}/${PV}/modules
+	insinto /usr/lib/snortalog/${PV}/modules
 	doins -r modules/*
 
-	cd doc
-	dodoc CHANGES
+	dodoc doc/CHANGES
 }