Fix SNMP_Session::pack_sockaddr_in redefinition (bug #509986 by Sven).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 27 insertions, 55 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 3f01aed8c7a2..abedb93906e1 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.115 2012/02/04 21:29:16 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.116 2014/05/10 17:22:18 jer Exp $
+
+*mrtg-2.17.4-r1 (10 May 2014)
+
+  10 May 2014; Jeroen Roovers <jer@gentoo.org> -mrtg-2.17.2.ebuild,
+  -mrtg-2.17.4.ebuild, +mrtg-2.17.4-r1.ebuild,
+  +files/mrtg-2.17.4-socket6.patch:
+  Fix SNMP_Session::pack_sockaddr_in redefinition (bug #509986 by Sven).
 
   04 Feb 2012; Tim Harder <radhermit@gentoo.org> -mrtg-2.16.2.ebuild,
   -mrtg-2.16.2-r1.ebuild, -mrtg-2.16.4.ebuild:
diff --git a/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
new file mode 100644
index 000000000000..5540874d9a00
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
@@ -0,0 +1,11 @@
+--- a/bin/mrtg
++++ b/bin/mrtg
+@@ -300,7 +300,7 @@ sub main {
+     if ($cfg{enableipv6} eq 'yes') {
+         if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) {
+             import Socket;
+-            import Socket6;
++            Socket6->import(qw(inet_pton getaddrinfo));
+             debug('base', "IPv6 libraries found, IPv6 enabled.");
+         } else {
+             warn "$NOW: WARNING: IPv6 libraries not found, IPv6 disabled.\n";
diff --git a/net-analyzer/mrtg/mrtg-2.17.2.ebuild b/net-analyzer/mrtg/mrtg-2.17.2.ebuild
deleted file mode 100644
index ea6922d79841..000000000000
--- a/net-analyzer/mrtg/mrtg-2.17.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.2.ebuild,v 1.3 2011/08/20 20:30:10 jer Exp $
-
-EAPI="4"
-
-inherit eutils
-
-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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	dev-perl/SNMP_Session
-	>=dev-perl/Socket6-0.20
-	>=media-libs/gd-1.8.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
-}
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	emake DESTDIR="${ED}" install
-	mv "${ED}/usr/share/doc/"{mrtg2,${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.17.4.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index 951e5d2b33f6..d1a0da280996 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4.ebuild,v 1.1 2012/02/04 21:26:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.1 2014/05/10 17:22:18 jer Exp $
 
-EAPI="4"
+EAPI=5
+inherit eutils
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://oss.oetiker.ch/mrtg/"
@@ -11,7 +12,6 @@ SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
 
 DEPEND="dev-lang/perl
 	dev-perl/SNMP_Session
@@ -20,21 +20,17 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-socket6.patch
 	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
 }
 
 src_install () {
 	keepdir /var/lib/mrtg
 
-	emake DESTDIR="${ED}" install
+	default
+
 	mv "${ED}/usr/share/doc/"{mrtg2,${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"
-}