7 files changed, 18 insertions, 80 deletions
diff --git a/net-mail/mailgraph/ChangeLog b/net-mail/mailgraph/ChangeLog
index d5a61de48ac9..4d79233d9c37 100644
--- a/net-mail/mailgraph/ChangeLog
+++ b/net-mail/mailgraph/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/mailgraph
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.17 2007/04/01 18:27:52 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.18 2007/04/01 18:36:39 ticho Exp $
+
+*mailgraph-1.13 (01 Apr 2007)
+
+  01 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  -files/mailgraph-1.11-regexp.patch, -mailgraph-1.11.ebuild,
+  -mailgraph-1.11-r1.ebuild, +mailgraph-1.13.ebuild:
+  Removed obsolete ebuilds. Version bump to 1.13. Changed URL in HOMEPAGE and
+  SRC_URI to follow upstream.
 
   01 Apr 2007; Andrej Kacian <ticho@gentoo.org> mailgraph-1.11.ebuild,
   mailgraph-1.11-r1.ebuild, mailgraph-1.12.ebuild:
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.11 b/net-mail/mailgraph/files/digest-mailgraph-1.11
deleted file mode 100644
index f02ce4cdfd44..000000000000
--- a/net-mail/mailgraph/files/digest-mailgraph-1.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ddb4804e51c81dcdd5c3f7242031b11 mailgraph-1.11.tar.gz 19719
-RMD160 d31d30fbcdc02757c147cd7abd03365c6a3d4876 mailgraph-1.11.tar.gz 19719
-SHA256 c7fc8c418c63e1d18364888f1dce2f038bdb323e4c04a57abdb67f669e2c101a mailgraph-1.11.tar.gz 19719
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.11-r1 b/net-mail/mailgraph/files/digest-mailgraph-1.11-r1
deleted file mode 100644
index f02ce4cdfd44..000000000000
--- a/net-mail/mailgraph/files/digest-mailgraph-1.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ddb4804e51c81dcdd5c3f7242031b11 mailgraph-1.11.tar.gz 19719
-RMD160 d31d30fbcdc02757c147cd7abd03365c6a3d4876 mailgraph-1.11.tar.gz 19719
-SHA256 c7fc8c418c63e1d18364888f1dce2f038bdb323e4c04a57abdb67f669e2c101a mailgraph-1.11.tar.gz 19719
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.13 b/net-mail/mailgraph/files/digest-mailgraph-1.13
new file mode 100644
index 000000000000..5031f30f5a2c
--- /dev/null
+++ b/net-mail/mailgraph/files/digest-mailgraph-1.13
@@ -0,0 +1,3 @@
+MD5 b59cc2375662f6c113c6be2ab5bfa179 mailgraph-1.13.tar.gz 21322
+RMD160 8c4e393e548b99a49da4f35c8b8a104d5bf14339 mailgraph-1.13.tar.gz 21322
+SHA256 f08476371b59b1e2313b388e962e6ff968432d4b66520c11e8b05ff7e968c6c8 mailgraph-1.13.tar.gz 21322
diff --git a/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch b/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch
deleted file mode 100644
index 414af5a3d12b..000000000000
--- a/net-mail/mailgraph/files/mailgraph-1.11-regexp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index fdff48a89c59..000000000000
--- a/net-mail/mailgraph/mailgraph-1.11-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 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.3 2007/04/01 18:27:52 ticho 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="~amd64 ~ppc x86"
-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
-
-	webapp_src_install
-}
diff --git a/net-mail/mailgraph/mailgraph-1.11.ebuild b/net-mail/mailgraph/mailgraph-1.13.ebuild
index f1d19ac57ba7..1428ccd9849d 100644
--- a/net-mail/mailgraph/mailgraph-1.11.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.13.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.11.ebuild,v 1.5 2007/04/01 18:27:52 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.13.ebuild,v 1.1 2007/04/01 18:36:39 ticho 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"
+HOMEPAGE="http://mailgraph.schweikert.ch"
+SRC_URI="http://mailgraph.schweikert.ch/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	dev-perl/File-Tail
 	>=net-analyzer/rrdtool-1.2.2"
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	>=net-analyzer/rrdtool-1.2.2"
 
 pkg_setup() {
 	webapp_pkg_setup