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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index f35138c41cc779bca450ae153c3659a0ac3cdd05..fda8fa6ed6e109cef81f7ad38b5573be67853422 100644 (file)
--- 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/Manifest b/net-analyzer/mrtg/Manifest
index d1b3db9ba949450e09a532b5b61b2bf8cf0b9d1f..d43d751b1a6296fc48791d59f54da138293a7edb 100644 (file)
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,10 +1,7 @@
 AUX mrtg.confd 512 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 SHA1 b3248d27b94155f14240c9d4151c5a789cc152c1 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7
 AUX mrtg.rc 1388 RMD160 beb973376ed5f5f1022fdc3caa1fdc5393c18a4a SHA1 11f32fbcc911ae3200eed8a41184cea6e94f93cb SHA256 25aa80a6eac6b7ca09a577c1ff895d40a03c167892aa1f2dde39a5085b24c41a
-DIST mrtg-2.15.2.tar.gz 1070900 RMD160 cf21cfeb5e68b00fec7552b58c60ad22a0c47e47 SHA1 1d814dfeeaa77f83a0e6c20c4b9a5f9dcbd24089 SHA256 3456f358c1ea5ae5182153169c3effd2cd4b071c4d12f36e03947a62372f87ab
-DIST mrtg-2.16.1.tar.gz 1077657 RMD160 1d4247faa561dbc67d00cb7c7980bcc2d998337b SHA1 cb389cebf258611da3e0bfeff96b4d0d02131c55 SHA256 5a5d8859bdd1cdcbb5f7268cbb8438e7fb0cd1e91f50f901970b34d6775e2757
 DIST mrtg-2.16.2.tar.gz 1078423 RMD160 2d60324f6c3bcd64fcd6b626ec6a36d4d3c92604 SHA1 44f336c79e1418b59f5a25cb5cc03a82f983fdea SHA256 ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385
-EBUILD mrtg-2.15.2.ebuild 946 RMD160 6540854d6e002c09078b132f22324904874a6a56 SHA1 6a067a8b21e2d871a23c0426a3e63e161db65a2d SHA256 b0ccdf00bdd2ca64de24cc8d005870e323b578c3d43230613ab683af044c64bc
-EBUILD mrtg-2.16.1.ebuild 946 RMD160 4fa4d09dca9b0d8931d807f47c957b7ceb590c73 SHA1 66f2e0b175097ffc0b0ed60c1f69cbacd0f40602 SHA256 9dd481dc7b98a40a91915f03ce037a03f1fcea640c097adb581a610527d734bf
+EBUILD mrtg-2.16.2-r1.ebuild 1044 RMD160 4ff0f85e3ff5dcd3baddfddf64894244f9dbb0db SHA1 00194c3cff0aad36e790c0fd32ec2b6ac7355ae7 SHA256 6fc5482a5a87a13196579ef5ebe052d549cf3b397e5b5f85a496a2b6a7985534
 EBUILD mrtg-2.16.2.ebuild 946 RMD160 e5bce435f8cf90ab86cf9fb6209f6167621aaed6 SHA1 335e2cc2e9ef2e8ca93300cf365032bb651c7351 SHA256 d4e9d4bd111facb54d969d1dad2a3dbdf1c378789c1302b45567d9c7a30540bb
-MISC ChangeLog 11865 RMD160 ec3ec5526ae21026c12cc0f67c72f0718a997e0e SHA1 2611b19334ce05bd06c8742860be082beab5d2a1 SHA256 f00bf0e1e7bb03227029a6db5346a5f0166077ffe55e10fa9c0e8369346f17da
+MISC ChangeLog 12068 RMD160 edf5046643123b683b533394d9774529ee27e7ef SHA1 9538e965077d58d88c5e4bcc862e424d37e3f284 SHA256 ff70e03ab908b1efc635492ccf204e7220b2b1403d6af6a82d0eaced9b61a584
 MISC metadata.xml 221 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 SHA1 59ce39c64900516f7d583951daacb16fc01f0ea1 SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110

diff --git a/net-analyzer/mrtg/mrtg-2.16.1.ebuild b/net-analyzer/mrtg/mrtg-2.16.1.ebuild
deleted file mode 100644 (file)
index ae628d0..0000000
--- 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
similarity index 52%
rename from net-analyzer/mrtg/mrtg-2.15.2.ebuild
rename to net-analyzer/mrtg/mrtg-2.16.2-r1.ebuild
index 973e6f3e998693f1e13fe76b3ccf370500f26721..176fef7936a847011b63abd9a5d209ea24b78e89 100644 (file)
--- 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(){