revision bump to get the regexp patch

(Portage version: 2.0.51.22-r1)

5 files changed, 82 insertions, 13 deletions

diff --git a/net-mail/mailgraph/ChangeLog b/net-mail/mailgraph/ChangeLog
index 254196dae235..fcfb8d69a329 100644
--- a/net-mail/mailgraph/ChangeLog
+++ b/net-mail/mailgraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mailgraph
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.5 2005/06/26 23:37:57 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.6 2005/06/27 02:08:16 halcy0n Exp $
+
+*mailgraph-1.11-r1 (27 Jun 2005)
+
+  27 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/mailgraph-1.11-regexp.patch, +mailgraph-1.11-r1.ebuild:
+  Revision bump to get the patch from bug #97151.  Thanks to Andrej Kacian
+  <ticho@gentoo.org> for the patch.
 
   26 Jun 2005; Andrej Kacian <ticho@gentoo.org> mailgraph-1.11.ebuild:
   Added ~amd64 keyword.
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index 318fbd5ae616..916186f3bd90 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 32091e12a0d4c659816591dc67c1ab04 mailgraph-1.11.ebuild 1383
 MD5 34752f9a870354ff8f7567ade74fe67b ChangeLog 922
+MD5 32091e12a0d4c659816591dc67c1ab04 mailgraph-1.11.ebuild 1383
 MD5 12cc0b3f6dae806d246c36bd9ea010e9 metadata.xml 259
+MD5 40c00d9f591e3ca5795198063119077a mailgraph-1.11-r1.ebuild 1421
+MD5 ca32a39fff4fa2c070d832feb539f47d files/digest-mailgraph-1.11 65
 MD5 fa47226fdde5601a3b0ae0d19377019f files/mailgraph.confd 476
 MD5 608f945e78c754fb3f5aee14881ec2da files/mailgraph.initd 685
-MD5 ca32a39fff4fa2c070d832feb539f47d files/digest-mailgraph-1.11 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCvzxqQlM6RnzZP+IRAgf/AKCA1SpzZW9TFIqpoJHw/Q2y9+SsPwCgr7iX
-+/mcwLURJvmX6DnhAJb+CLw=
-=+9Oy
------END PGP SIGNATURE-----
+MD5 33feb3504b889ed382183cecbbeafa57 files/mailgraph-1.11-regexp.patch 427
+MD5 ca32a39fff4fa2c070d832feb539f47d files/digest-mailgraph-1.11-r1 65
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.11-r1 b/net-mail/mailgraph/files/digest-mailgraph-1.11-r1
new file mode 100644
index 000000000000..359f48fbdaec
--- /dev/null
+++ b/net-mail/mailgraph/files/digest-mailgraph-1.11-r1
@@ -0,0 +1 @@
+MD5 6ddb4804e51c81dcdd5c3f7242031b11 mailgraph-1.11.tar.gz 19719
diff --git a/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch b/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch
new file mode 100644
index 000000000000..414af5a3d12b
--- /dev/null
+++ b/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch
@@ -0,0 +1,11 @@
+--- mailgraph.pl.orig	2005-06-27 01:34:55.000000000 +0200
++++ mailgraph.pl	2005-06-27 01:34:31.000000000 +0200
+@@ -138,7 +138,7 @@
+             (\d+):(\d+):(\d+) # time  -- 3, 4, 5
+             (?:\s<\w+\.\w+>)? # FreeBSD's verbose-mode
+             \s
+-            ([-\w\.]+)        # host  -- 6
++            ([-\w\.\@]+)        # host  -- 6
+             \s+
+             (.*)              # text  -- 7
+             $/x or do
diff --git a/net-mail/mailgraph/mailgraph-1.11-r1.ebuild b/net-mail/mailgraph/mailgraph-1.11-r1.ebuild
new file mode 100644
index 000000000000..454f908fdd4d
--- /dev/null
+++ b/net-mail/mailgraph/mailgraph-1.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.11-r1.ebuild,v 1.1 2005/06/27 02:08:16 halcy0n Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
+HOMEPAGE="http://people.ee.ethz.ch/~dws/software/mailgraph/"
+SRC_URI="http://people.ee.ethz.ch/~dws/software/${PN}/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/File-Tail
+	>=net-analyzer/rrdtool-1.2.2"
+DEPEND=">=sys-apps/sed-4"
+
+pkg_setup() {
+	webapp_pkg_setup
+	built_with_use net-analyzer/rrdtool perl \
+		|| die "net-analyzer/rrdtool must be built with USE=perl"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
+		-e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
+		mailgraph.cgi || die "sed mailgraph.cgi failed"
+	epatch ${FILESDIR}/${P}-regexp.patch
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# for the RRDs
+	keepdir /var/lib/mailgraph
+
+	# mailgraph daemon
+	newbin mailgraph.pl mailgraph
+
+	# mailgraph CGI script
+	exeinto ${MY_CGIBINDIR}
+	doexe mailgraph.cgi
+
+	# init/conf files for mailgraph daemon
+	newinitd ${FILESDIR}/mailgraph.initd mailgraph
+	newconfd ${FILESDIR}/mailgraph.confd mailgraph
+
+	# docs
+	dodoc README CHANGES COPYING
+
+	webapp_src_install
+}