bug 96535

Package-Manager: portage-2.0.51.19

15 files changed, 76 insertions, 161 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 291f1289b192..e1abaf99df52 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/mrtg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.40 2005/06/17 20:33:39 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.41 2005/06/19 18:24:49 vanquirius Exp $
+
+*mrtg-2.12.2 (19 Jun 2005)
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> files/mrtg.rc,
+  -mrtg-2.9.22.ebuild, -mrtg-2.10.14.ebuild, -mrtg-2.10.15.ebuild,
+  -mrtg-2.11.0.ebuild, mrtg-2.11.1.ebuild, mrtg-2.12.1.ebuild,
+  +mrtg-2.12.2.ebuild:
+  Remove old ebuilds, version bump, add configuration message in pkg_postinst
+  and fix utf-8 locales. The last fix was provided by Lars T. Mikkelsen
+  <ltm@mulm.dk> in bug 96535.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mrtg-2.11.1.ebuild:
   Stable on ppc.
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 2281bfddb1f4..9508d3c7daee 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,16 +1,10 @@
-MD5 26e849d90b66e5cf9a20c784a5fedf87 mrtg-2.11.1.ebuild 986
-MD5 2a638f1afd9ac1de2201d52898ba34ea mrtg-2.9.22.ebuild 1003
+MD5 17c12067590b47925e3c86bf37a4f62b mrtg-2.12.1.ebuild 1194
+MD5 e27b03007d97ff350494bc2c05bdd1bb mrtg-2.12.2.ebuild 1194
+MD5 7523ce5bda129444ab57ec1d15a187be ChangeLog 5262
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
-MD5 e05980aee78d79061f4e0094b93f352d ChangeLog 4829
-MD5 14d32e686dd2b1e485c65a6f421b044b mrtg-2.12.1.ebuild 993
-MD5 1478cbda8cc0bead4164037f43ad9708 mrtg-2.11.0.ebuild 1070
-MD5 9a5a93ec1fb27067a466215ea79b052c mrtg-2.10.15.ebuild 1067
-MD5 c2e8d481bfc0ee11706739f2254a2eab mrtg-2.10.14.ebuild 1054
-MD5 600205c986160fe48cd6053e39f74644 files/digest-mrtg-2.11.0 64
-MD5 99d47668bd56ffee8a76da73dfcdf81c files/digest-mrtg-2.10.15 65
-MD5 85c2c5bcbc07346b4d167bc4ebe4ba9a files/digest-mrtg-2.10.14 65
-MD5 c9944b21a429dee42089beb12fde4dec files/mrtg.rc 1280
-MD5 b984863c1e7c00e4a0829e901c6cc492 files/digest-mrtg-2.9.22 64
+MD5 68c9f31189efe33ed1abae27bad06d29 mrtg-2.11.1.ebuild 1188
 MD5 892b30d2bab4ab965453b5bef89cfecb files/digest-mrtg-2.11.1 64
-MD5 a8d246d324b90fd1e37cc912d4651372 files/mrtg.confd 512
 MD5 3504978d284268fb850a17a8e72ea037 files/digest-mrtg-2.12.1 64
+MD5 26ac2190042c1cb4fec97a5370c0803d files/digest-mrtg-2.12.2 64
+MD5 aff06f9e2832b17c9c558a58472a3091 files/mrtg.rc 1284
+MD5 a8d246d324b90fd1e37cc912d4651372 files/mrtg.confd 512
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.10.14 b/net-analyzer/mrtg/files/digest-mrtg-2.10.14
deleted file mode 100644
index 62f749c48a5c..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.10.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5c8acfd7cef7a8894ee65e573819cc4 mrtg-2.10.14.tar.gz 1101215
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.10.15 b/net-analyzer/mrtg/files/digest-mrtg-2.10.15
deleted file mode 100644
index 8325d854c9a7..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.10.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39f3afeac9a7fdba8e4e500313234e50 mrtg-2.10.15.tar.gz 1105158
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.11.0 b/net-analyzer/mrtg/files/digest-mrtg-2.11.0
deleted file mode 100644
index 52961a235b8a..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f3b2a73f4fb03a556be78c5400eb3b4 mrtg-2.11.0.tar.gz 1113801
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.12.2 b/net-analyzer/mrtg/files/digest-mrtg-2.12.2
new file mode 100644
index 000000000000..123bb4953e8a
--- /dev/null
+++ b/net-analyzer/mrtg/files/digest-mrtg-2.12.2
@@ -0,0 +1 @@
+MD5 dd74c4f28ac594938d15dc16b7f88bd2 mrtg-2.12.2.tar.gz 1135438
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.9.22 b/net-analyzer/mrtg/files/digest-mrtg-2.9.22
deleted file mode 100644
index 0bb096241807..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.9.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca568e4f452ff82f3d6d1461e3dbf98b mrtg-2.9.22.tar.gz 1007515
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index 820f22a5bb37..7d2060f000c2 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.2 2005/01/26 10:35:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.3 2005/06/19 18:24:49 vanquirius Exp $
 
 depend() {
     need net
@@ -22,7 +22,7 @@ checkconfig() {
 
 start() {
 	# mrtg will not run if LANG=*utf8
-	[[ "${LANG}" == *[uU][tT][fF]8 ]] && LANG='C'
+	[[ "${LANG}" == *[uU][tT][fF]?8 ]] && LANG='C'
 
 	checkconfig || return $?
 
diff --git a/net-analyzer/mrtg/mrtg-2.10.14.ebuild b/net-analyzer/mrtg/mrtg-2.10.14.ebuild
deleted file mode 100644
index 738b6973db48..000000000000
--- a/net-analyzer/mrtg/mrtg-2.10.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.10.14.ebuild,v 1.10 2005/01/26 10:35:05 ka0ttic 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="x86 ppc sparc ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
-	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/*.html images/*
-	newinitd ${FILESDIR}/mrtg.rc ${PN}
-	newconfd ${FILESDIR}/mrtg.confd ${PN}
-}
diff --git a/net-analyzer/mrtg/mrtg-2.10.15.ebuild b/net-analyzer/mrtg/mrtg-2.10.15.ebuild
deleted file mode 100644
index 75ce3d2e83b9..000000000000
--- a/net-analyzer/mrtg/mrtg-2.10.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.10.15.ebuild,v 1.9 2005/01/26 10:35:05 ka0ttic 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="x86 ppc sparc ~ppc64 ~amd64 alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
-	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/*.html images/*
-	newinitd ${FILESDIR}/mrtg.rc ${PN}
-	newconfd ${FILESDIR}/mrtg.confd ${PN}
-}
diff --git a/net-analyzer/mrtg/mrtg-2.11.0.ebuild b/net-analyzer/mrtg/mrtg-2.11.0.ebuild
deleted file mode 100644
index 402e4f05cf40..000000000000
--- a/net-analyzer/mrtg/mrtg-2.11.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.0.ebuild,v 1.3 2005/01/26 10:35:05 ka0ttic 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="~x86 ~ppc ~sparc ~ppc64 ~amd64 ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
-	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/*.html images/*
-	newinitd ${FILESDIR}/mrtg.rc ${PN}
-	newconfd ${FILESDIR}/mrtg.confd ${PN}
-}
diff --git a/net-analyzer/mrtg/mrtg-2.11.1.ebuild b/net-analyzer/mrtg/mrtg-2.11.1.ebuild
index f8118c7cfe1a..9ea885dbaa11 100644
--- a/net-analyzer/mrtg/mrtg-2.11.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.8 2005/06/17 20:33:39 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.9 2005/06/19 18:24:49 vanquirius Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -33,3 +33,9 @@ src_install () {
 		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"
+}
diff --git a/net-analyzer/mrtg/mrtg-2.12.1.ebuild b/net-analyzer/mrtg/mrtg-2.12.1.ebuild
index f3779a83faf6..c6cc4ea156a7 100644
--- a/net-analyzer/mrtg/mrtg-2.12.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.1 2005/05/29 00:15:43 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.2 2005/06/19 18:24:49 vanquirius Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -33,3 +33,9 @@ src_install () {
 		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"
+}
diff --git a/net-analyzer/mrtg/mrtg-2.12.2.ebuild b/net-analyzer/mrtg/mrtg-2.12.2.ebuild
new file mode 100644
index 000000000000..715fa3102366
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.12.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.2.ebuild,v 1.1 2005/06/19 18:24:49 vanquirius 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 ~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 COPYING CHANGES COPYRIGHT MANIFEST README THANKS
+
+	if use doc ; then
+		docinto txt ; dodoc doc/*.txt
+		cp -a 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"
+}
diff --git a/net-analyzer/mrtg/mrtg-2.9.22.ebuild b/net-analyzer/mrtg/mrtg-2.9.22.ebuild
deleted file mode 100644
index 7d5f8acce03e..000000000000
--- a/net-analyzer/mrtg/mrtg-2.9.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.22.ebuild,v 1.10 2005/01/05 23:25:01 swtaylor 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="x86 ppc sparc alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.3"
-#	>=media-libs/libpng-1.2.1"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
-	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/* images/*
-}