Update to latest release. Added slot, keywords, license.

8 files changed, 47 insertions, 74 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 6b0f84230e33..43b39c27f69d 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/mrtg
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.3 2002/04/14 07:17:37 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.4 2002/07/11 01:52:53 nitro Exp $
+
+*mrtg-2.9.21 (10 Jul 2002)
+
+  10 Jul 2002; Kyle Manna <nitro@gentoo.org> mrtg-2.9.17.ebuild mrtg-2.9.21.ebuild:
+
+  Update to latest release. Added slot, keywords, license.
 
 *mrtg-2.9.17 (14 Apr 2002)
 
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.9.21 b/net-analyzer/mrtg/files/digest-mrtg-2.9.21
new file mode 100644
index 000000000000..0dfb2455651f
--- /dev/null
+++ b/net-analyzer/mrtg/files/digest-mrtg-2.9.21
@@ -0,0 +1 @@
+MD5 3dc418696237276ed2c3e2c859e135d2 mrtg-2.9.21.tar.gz 1006519
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.9.7 b/net-analyzer/mrtg/files/digest-mrtg-2.9.7
deleted file mode 100644
index 896972dfb97d..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab114ce2aa3808dd23418fe625b606d9 mrtg-2.9.7.tar.gz 916241
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.9.7-r1 b/net-analyzer/mrtg/files/digest-mrtg-2.9.7-r1
deleted file mode 100644
index 896972dfb97d..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.9.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab114ce2aa3808dd23418fe625b606d9 mrtg-2.9.7.tar.gz 916241
diff --git a/net-analyzer/mrtg/mrtg-2.9.17.ebuild b/net-analyzer/mrtg/mrtg-2.9.17.ebuild
index 383cceb8a74e..2d7484a2ab62 100644
--- a/net-analyzer/mrtg/mrtg-2.9.17.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.9.17.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.17.ebuild,v 1.1 2002/04/14 07:17:37 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.17.ebuild,v 1.2 2002/07/11 01:52:53 nitro Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/${P}.tar.gz"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
 
+KEYWORDS="x86"
+LICENSE="GPL-2"
+SLOT="0"
+
 DEPEND="virtual/glibc
 	sys-devel/perl
 	>=media-libs/libgd-1.8.3"
diff --git a/net-analyzer/mrtg/mrtg-2.9.21.ebuild b/net-analyzer/mrtg/mrtg-2.9.21.ebuild
new file mode 100644
index 000000000000..dcf6cd072c10
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.9.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.21.ebuild,v 1.1 2002/07/11 01:52:53 nitro Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/${P}.tar.gz"
+HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
+
+KEYWORDS="x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc
+	sys-devel/perl
+	>=media-libs/libgd-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/*
+}
diff --git a/net-analyzer/mrtg/mrtg-2.9.7-r1.ebuild b/net-analyzer/mrtg/mrtg-2.9.7-r1.ebuild
deleted file mode 100644
index 6ff2af6d2387..000000000000
--- a/net-analyzer/mrtg/mrtg-2.9.7-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.7-r1.ebuild,v 1.1 2002/04/12 22:24:31 spider Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-2.9.7.tar.gz"
-HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
-
-DEPEND="virtual/glibc sys-devel/perl >=media-libs/libgd-1.8.3"
-RDEPEND="virtual/glibc sys-devel/perl >=media-libs/libpng-1.2.1 "
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr install
-    dodir /usr/share/man
-    mv ${D}/usr/man/man1 ${D}/usr/share/man
-    rm -rf ${D}/usr/man
-    rm -r ${D}/usr/doc
-    dodoc ANNOUNCE COPYING CHANGES COPYRIGHT
-    dodoc MANIFEST README THANKS
-    docinto txt
-    dodoc doc/*.txt
-    docinto html
-    dodoc doc/*.html images/*
-}
-
diff --git a/net-analyzer/mrtg/mrtg-2.9.7.ebuild b/net-analyzer/mrtg/mrtg-2.9.7.ebuild
deleted file mode 100644
index c9655e726aed..000000000000
--- a/net-analyzer/mrtg/mrtg-2.9.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.9.7.ebuild,v 1.3 2001/06/04 00:16:12 achim Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-2.9.7.tar.gz"
-HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
-
-DEPEND="virtual/glibc sys-devel/perl >=media-libs/libgd-1.8.3"
-RDEPEND="virtual/glibc sys-devel/perl >=media-libs/libpng-1.0.10 "
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr install
-    dodir /usr/share/man
-    mv ${D}/usr/man/man1 ${D}/usr/share/man
-    rm -rf ${D}/usr/man
-    rm -r ${D}/usr/doc
-    dodoc ANNOUNCE COPYING CHANGES COPYRIGHT
-    dodoc MANIFEST README THANKS
-    docinto txt
-    dodoc doc/*.txt
-    docinto html
-    dodoc doc/*.html images/*
-}
-