Use dev-perl/SNMP_Session instread of bunled one. Drop old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 22 insertions, 42 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index f35138c41cc7..fda8fa6ed6e1 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.98 2009/09/23 18:21:16 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.99 2010/05/29 04:48:18 pva Exp $
+
+*mrtg-2.16.2-r1 (29 May 2010)
+
+  29 May 2010; Peter Volkov <pva@gentoo.org> -mrtg-2.15.2.ebuild,
+  -mrtg-2.16.1.ebuild, +mrtg-2.16.2-r1.ebuild:
+  Use dev-perl/SNMP_Session instread of bunled one. Drop old.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> mrtg-2.15.2.ebuild,
   mrtg-2.16.1.ebuild, mrtg-2.16.2.ebuild:
diff --git a/net-analyzer/mrtg/mrtg-2.16.1.ebuild b/net-analyzer/mrtg/mrtg-2.16.1.ebuild
deleted file mode 100644
index ae628d053f6f..000000000000
--- a/net-analyzer/mrtg/mrtg-2.16.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.16.1.ebuild,v 1.8 2009/09/23 18:21:16 patrick Exp $
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}"/usr/share/doc/mrtg2  "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}"/mrtg.rc ${PN}
-	newconfd "${FILESDIR}"/mrtg.confd ${PN}
-
-}
-
-pkg_postinst(){
-	elog "You must configure mrtg before being able to run it. Try cfgmaker."
-	elog "The following thread may be useful:"
-	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
-}
diff --git a/net-analyzer/mrtg/mrtg-2.15.2.ebuild b/net-analyzer/mrtg/mrtg-2.16.2-r1.ebuild
index 973e6f3e9986..176fef7936a8 100644
--- a/net-analyzer/mrtg/mrtg-2.15.2.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.16.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.15.2.ebuild,v 1.8 2009/09/23 18:21:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.16.2-r1.ebuild,v 1.1 2010/05/29 04:48:18 pva Exp $
+
+EAPI="3"
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://oss.oetiker.ch/mrtg/"
@@ -8,21 +10,25 @@ SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
+	dev-perl/SNMP_Session
 	>=media-libs/gd-1.8.4"
 
+src_prepare() {
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+}
+
 src_install () {
 	keepdir /var/lib/mrtg
 
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}"/usr/share/doc/mrtg2  "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}"/mrtg.rc ${PN}
-	newconfd "${FILESDIR}"/mrtg.confd ${PN}
+	emake DESTDIR="${ED}" install || die "emake install failed"
+	mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
 
+	newinitd "${FILESDIR}/mrtg.rc" ${PN} || die
+	newconfd "${FILESDIR}/mrtg.confd" ${PN} || die
 }
 
 pkg_postinst(){