removed old version. fixed LANG setting with patch from bug #132652.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 52 insertions, 3 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 409ef21cb4ef..09664a97b675 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/mrtg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.44 2006/03/31 20:42:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.45 2006/05/11 11:03:09 dragonheart Exp $
+
+*mrtg-2.13.2-r1 (11 May 2006)
+
+  11 May 2006; Daniel Black <dragonheart@gentoo.org> files/mrtg.rc,
+  -mrtg-2.12.2.ebuild, -mrtg-2.13.2.ebuild, +mrtg-2.13.2-r1.ebuild:
+  removed old version. fixed LANG setting thanks to Angelo Letos patch from bug
 
   31 Mar 2006; Markus Ullmann <jokey@gentoo.org> mrtg-2.11.1.ebuild,
   mrtg-2.12.2.ebuild, mrtg-2.13.2.ebuild:
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.13.2-r1 b/net-analyzer/mrtg/files/digest-mrtg-2.13.2-r1
new file mode 100644
index 000000000000..4720820d6262
--- /dev/null
+++ b/net-analyzer/mrtg/files/digest-mrtg-2.13.2-r1
@@ -0,0 +1 @@
+MD5 daab44b14d608cda831b4dc481cec38a mrtg-2.13.2.tar.gz 1107214
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index 7d2060f000c2..ef7e573d50a4 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.3 2005/06/19 18:24:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.4 2006/05/11 11:03:09 dragonheart Exp $
 
 depend() {
     need net
@@ -22,7 +22,8 @@ checkconfig() {
 
 start() {
 	# mrtg will not run if LANG=*utf8
-	[[ "${LANG}" == *[uU][tT][fF]?8 ]] && LANG='C'
+	[[ "${LANG}" =~ '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' ]] \
+	&& LANG='C'
 
 	checkconfig || return $?
 
diff --git a/net-analyzer/mrtg/mrtg-2.13.2-r1.ebuild b/net-analyzer/mrtg/mrtg-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..2394435c28f7
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.13.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.13.2-r1.ebuild,v 1.1 2006/05/11 11:03:09 dragonheart Exp $
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
+SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	dev-lang/perl
+	>=media-libs/gd-1.8.4"
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr ${D}/usr/share/doc/mrtg2
+
+	newinitd ${FILESDIR}/mrtg.rc ${PN}
+	newconfd ${FILESDIR}/mrtg.confd ${PN}
+
+	dodoc ANNOUNCE CHANGES COPYRIGHT MANIFEST README THANKS
+
+	if use doc ; then
+		docinto txt ; dodoc doc/*.txt
+		cp -pPR contrib ${D}/usr/share/doc/${PF}/contrib
+		prepalldocs
+		dohtml -r doc/*.html images/*
+	fi
+}
+
+pkg_postinst(){
+	einfo "You must configure mrtg before being able to run it. Try cfgmaker."
+	einfo "The following thread may be useful:"
+	einfo "http://forums.gentoo.org/viewtopic-t-105862.html"
+}